Revert "hoge"

This reverts commit 1243b0c084f5eac7ce5db4a318ee53c60ae45b87.
Merge branch 'master' of github.com:jiikko/yochiyochi_app

Conflicts:
	Rakefile