Reworked gemfile, added necessary gems for testing and Heroku.
Resolved merge conflict re: Gemfile, gitignore
Resolved conflict
Merge