Added contact form and 6-up
still not working... I
small semantic changes to a selector
fixed contact form
Fixed weird scrolling issues 1
Merge remote-tracking branch 'origin/thursday-changes'

Conflicts:
	stylesheets/main.css