Adds
Merge branch 'scott_dev'

Conflicts:
	public/stylesheets/main.css
updates main.scss