changes to contact info
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/stylesheets/helpers.css.scss
	app/views/home/index.html.haml