rake assets:precompile
Merge branch 'master' of https://github.com/woto/yaponama_2012

Conflicts:
	public/assets/manifest-d9fb6ca276c6d8595897abb3a6f71719.json