Site Update

Updated to new layout
Menu/Collage

Added menu and photo collage
Merge branch 'master' into dev

Conflicts:
	css/onepage-scroll.css
	img/Headshot.jpg
	img/aboutMeCollage.png
	index.html