shema
Merge branch 'master' of https://github.com/khcr/way

Conflicts:
	db/schema.rb