Merge branch 'master' of https://github.com/paulinele/artofespresso

Conflicts:
	contact.html