updated css scss
09222914CSS
Merge branch 'master' of https://github.com/TheTifster/chrezmo

Conflicts:
	.idea/workspace.xml
	app/views/welcome/index.html.erb