Merge

updated email
Merge branch 'master' of https://github.com/efuste/teamtreehouse

Conflicts:
	phpcourse/shirts4mike/contact.php