fixed images
finished switching CSS to SCSS
Merge branch 'master' into develop

Conflicts:
	css/main.css