transfer from another folder
heroku up but rake not working yet
keep committing
big merge with M