database.yml change
Merge branch 'heroku'
secret.yml
Merge branch 'heroku'
back to root
back to root
Merge branch 'heroku'

Conflicts:
	config/routes.rb
took out unicorn
Merge branch 'heroku'
static assets
Merge branch 'heroku'
moved config
Merge branch 'heroku'
removed assets