Commiting what I have so far so that I can merge changes from Paul
Merge branch 'master' of github.com:phillipsra16/BrewMe

Conflicts:
	BrewMe/settings.pyc
	Templates/Recipe/recipe.html