<<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 22cbef5 (Add all other pages) ======= >>>>>>> d7982e1 (Add error message to login, Fix Internal Error 500)