menu intermediate commit
Merge branch 'master' of github.com:thedesloge/living-galapagos

Conflicts:
	story_database/views.py