final commit before branching Fruday morning
Added bundler to app.rb
Merge branch 'master' of https://github.com/nodu/trackr
added .env file and updated bundle
Merge branch 'master' of https://github.com/nodu/trackr
Merge branch 'dotenv1'
update gitignore
.gitignore is fixed