update contact page 050714
Merge branch 'develop' into feature/update_contact_page_050714

Conflicts:
	contact.html
Merge pull request #39 from annaszekely/feature/update_contact_page_050714

Feature/update contact page 050714