Footer
Merge branch 'master' of https://github.com/erosenberg/buggy-app

Conflicts:
	app/assets/javascripts/app/views/content.js.coffee