Pre merge commit
Merge branch 'master' of https://github.com/mkaziz/EECS-337---Team-Six

Conflicts:
	Recipe/Recipe/static/Recipe/css/Recipe.css
	Recipe/Recipe/templates/index.html