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
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
Settings index and stylesheet
Merge branch 'master' of https://github.com/heatseeknyc/heatseeknyc