Style home attractions
Merge branch 'master' of github.com:MoshCreative/bonecos-canela

Conflicts:
	public/stylesheets/dev/site.css
	public/stylesheets/dist/site.css
Format tickets H1
Merge branch 'master' of github.com:MoshCreative/bonecos-canela

Conflicts:
	app/views/layouts/application.html.erb
	public/stylesheets/dev/site.css
	public/stylesheets/dist/site.css