Minor change
Merge branch 'master' of https://github.com/MichaelArestad/Sasstronauts

Conflicts:
	scss/_main.scss