updating contact form
final changes including content and removal of contact form
Merge branch 'master' into gh-pages

Conflicts:
	index.html