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

Conflicts:
	app/assets/stylesheets/kickstarter.css.scss
Correct url link & adjust tweet msg.

Adds correct links and twitter msg
Added Gothamist article
Adding more news mentions
update footer icons and set up settings page
Merge branch 'master' of github.com:heatseeknyc/heatseeknyc
add anchor link to contributors section
Sync online repo to my local repo, (kickstarter.css, index.html, kickstarter_lander)

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

Conflicts:
	app/assets/stylesheets/kickstarter.css.scss
	app/views/welcome/index.html.erb
	app/views/welcome/kickstarter_lander.html.erb
add michael to contributors section
Settings index and stylesheet
Merge branch 'master' of https://github.com/heatseeknyc/heatseeknyc
fixes form control border
disable delete button for demo accounts
adds legend
Merge branch 'chart-fix'
changes x value to 0
fixes violation count and better places dates on x-axis of chart
adds check to make sure it only draws coldmap on correct page
fixes error w/ tipsy offset in non web-kit browsers