footer
Merge branch 'master' of github.com:JGrubb/shockenaw

Conflicts:
	app/views/layouts/application.html.erb