Got Supp Buddies button
Merge branch 'master' into ui_overhaul
changed some fonts and text around on the login page
UI efforts
Merge branch 'ui_overhaul' of https://github.com/nfeliciano/mangiamo into ui_overhaul

Conflicts:
	app/client/css/login.css
Cleaned up the Login Page.  Working on meal times now.
Working somewhat
Working front-end meal times. Working on modal->sidebar integration
Got rid of modals, information is now displaying in the left sidebar
JoinMeal and CreateMeal now show up at the appropriate times.
Added user instructions on how to use the site before they click on a pin.  The user instructions disappear when a pin is clicked.
Waiting for backend code to make join and create meal work
added login dropdown, changed some css, and added a header logo
added login dropdown, changed some css, and added new header logo
creating meals at a certain time now works from the sidebar
Merge branch 'ui_overhaul' of https://github.com/nfeliciano/mangiamo into ui_overhaul
added an X to the info form on the login page
Merge branch 'ui_overhaul' of https://github.com/nfeliciano/mangiamo into ui_overhaul
changes to back end where people searches in a meal is now made by KEY rather than PLACE ID, meaning we can separate different meal times
Merge branch 'ui_overhaul' of https://github.com/nfeliciano/mangiamo into ui_overhaul