contacts
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/static_pages/contact.html.erb

Merge remote-tracking branch
'origin/master'

Conflicts:
	app/views/static_pages/contact.html.erb
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 346a9f7850371a1d74832354ddcb4948254e2bb4.