Added body to the database with attributes of each pokemon
Installed CarrierWAve
Set up S3 and enviroment variables
Started writing Carrier Wave tests
Added tests
reformated files
Merge pull request #6 from LaunchAcademy/PopulateDatabase

Added body to the database with attributes of each pokemon
Tests continue to fail
Merge branch 'master' of https://github.com/LaunchAcademy/char_brawls into AddCarrierWave
Happy path test
Style edits
Added env.example file and fixed layout
Merge pull request #9 from LaunchAcademy/AddCarrierWave

RFR - Added CarrierWave
Resolve merge conflicts