<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2a10814 (Add Display For Information + Logic)
=======
>>>>>>> 3fbcabc (Add Data Edit Page UI)
<<<<<<< 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)
