footer stuff
Merge branch 'master' of https://github.com/bohuie/jobcannon

Conflicts:
	app/views/layouts/_footer.html.erb
trying to get conflict ion resolved