scss v0.1
scss v0.2
Merge branch 'master' of https://github.com/chioshinu/first_rails_app

Conflicts:
	.idea/workspace.xml