Created initial application
Ignored some more common stuff
Update Gemfile.lock for Heroku
Added some test libs
Updated bundles
Fixed conflicts