commit
Merge branch 'master' of https://github.com/mbronsema/koshinkai

Conflicts:
	config/routes.rb