merge conflict stuff
form created for reservation tab
Map and Hovers
updates to form and menu tab, ready for api
 Mikey merge
merge conflicts updated
uhhhh