Added a bunch of cool new functionality i d g a f
Merge branch 'master' of https://github.com/apricots/midtown

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