I hate github.
Merge branch 'master' of https://github.com/heatseeknyc/heatseeknyc

Conflicts:
	app/assets/stylesheets/kickstarter.css.scss