new
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/static_pages/contacts.html.haml