Add 25th edition logo to menu
Add more padding to footer
Add box shadow to footer
Finish styling attraction page
Merge branch 'master' of github.com:MoshCreative/bonecos-canela

Conflicts:
	public/stylesheets/dev/site.css
	public/stylesheets/dist/site.css
	public/stylesheets/scss/site.scss