tweak
Merge branch 'master' of github.com:tily/kataomoi-14days

Conflicts:
	app.rb