style
Merge branch 'master' into Collin

Conflicts:
	css/screen.css
	index.html
	scss/screen.scss
Compiled Screen.