ref #39 in progress bootstrapped the header and nav bar
Merge remote-tracking branch 'origin/master' into header

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