<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD =======
>>>>>>> a260428 (Dashboard Entry Update)
======= >>>>>>> 22cbef5 (Add all other pages) =======
>>>>>>> d7982e1 (Add error message to login, Fix Internal Error 500) =======
>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
Register
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
Register
<<<<<<< HEAD =======
Register
>>>>>>> 22cbef5 (Add all other pages) =======
Register
>>>>>>> d7982e1 (Add error message to login, Fix Internal Error 500) ======= >>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
<<<<<<< HEAD <<<<<<< HEAD
Sign Up
=======
Login
>>>>>>> 22cbef5 (Add all other pages) =======
Sign Up
>>>>>>> d7982e1 (Add error message to login, Fix Internal Error 500) =======
Sign Up
>>>>>>> 7afbaba (Finish Frontend) =======
Sign Up
>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a