a ton of front end work
so much front end work
Merge branch 'master' of https://github.com/aimeemorgan/menu_project

Conflicts:
	controller.py
	static/css/bootstrap.css
	templates/explore_categories.html
	templates/explore_techniques.html
	templates/layout.html
	templates/menu.html
	webapp.py
so much front end work