Contact Email added to Contact Page
Merging
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	resources/contact.html