Added static welcome page
debugging the deploy
changed config.assets.compile = true
debugging heroku again
relocated haml gem in gemfile so heroku would see it
changed config.assets.compile = false
config.assets.compile = true again
completely reconfigured asset pipeline to work with heroku
reconfigured environment variables
uncommented mailer
removed inappropriate stuff
Welcome static page & css
sure

Merge branch 'hackathon' of https://github.com/a17levine/blocktalk into hackathon
Merge branch 'master' of https://github.com/a17levine/blocktalk into hackathon

sounds good

Conflicts:
	Gemfile.lock
fix filter issue on index.js