addition of main.scss
Merge branch 'master' of https://github.com/hbs-dev/tempgit

Conflicts:
	sass/styles.scss