Just committing so I can get latest push to master
Merge branch 'master' of github.com:phillipsra16/BrewMe

Conflicts:
	Recipe/forms.pyc
	Recipe/views.pyc
Comments should be working now