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

Conflicts:
	css/stylesheet.css