latest version of front end
finished the 1st version of the menu page
finished basic admin stuff
finished user section of admin
fixed merge conflicts!!!!!!!!!!