トップの変更
Merge branch 'master' of https://github.com/gamerinshaft/ScssTest

Conflicts:
	app/views/homes/index.html.haml