reformated files
Merge pull request #6 from LaunchAcademy/PopulateDatabase

Added body to the database with attributes of each pokemon
Merge branch 'master' of https://github.com/LaunchAcademy/char_brawls into AddCarrierWave
Happy path test