init
merge; added Heroku specific files