Merge branch 'master' of https://github.com/TessMyers/space-snow
resolves merge conflict for building layout changes
Conflicts:
	client/scss/main.scss
	server/views/index.ejs
Merge branch 'master' of https://github.com/TessMyers/space-snow
fixing extra divs detail