test
Merge branch 'master' of https://github.com/willio/banquet

Conflicts:
	db/schema.rb