Add hookah.
Merge pull request #1 from atsheehan/add_hookahs

Add hookah.
Merge branch 'master' into fs-create-users

Conflicts:
	config/routes.rb