Added matchup associations, review, views, and mo!
Fixed some stuff, renamed reviews to opinions
Resolved merge conflict withremote  master
Resolved merge conflict withremote  master
Removed auto-merge detritus
Ahhh more auto-merge stuff
Tweakin
Added body to the database with attributes of each pokemon
more tweaks to fails and modifying spec-feature-files
Installed CarrierWAve
Set up S3 and enviroment variables
Started writing Carrier Wave tests
fixed create a matchup and review a matchup
Added tests
reformated files
fixed character matchup and opinions
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
Indentation & whitespace edits