Create default app
Update .gitignore
Update gemfile for Heroku
Add precompiled assets for Heroku
Resolve conflict