Core Website now Complete! V1.0
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	sass/screen.scss
	stylesheets/screen.css