xsにかえた
Merge branch 'master' of github.com:gamerinshaft/ScssTest

Conflicts:
	app/views/development/index.html.haml
Merge branch 'master' of github.com:gamerinshaft/ScssTest