<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a <<<<<<< HEAD ======= ======= >>>>>>> 2a10814 (Add Display For Information + Logic) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a260428 (Dashboard Entry Update) ======= ======= >>>>>>> 69bfc65 (Add Form Logic) <<<<<<< HEAD >>>>>>> b6d960f (Add Add Entry Page & CSS Animations) ======= ======= >>>>>>> 7afbaba (Finish Frontend) >>>>>>> 19834dd (Add Change Password Function + Dashboard Complete) ======= >>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a