fixed contact page
merging stuff
Merge branch 'master' of https://github.com/jlastrachan/ServeUs

Conflicts:
	contact2.html