Updating read me and adding scss
Merge branch 'master' of https://github.com/josephmosby/starter_stack

Conflicts:
	README.md