commiting changes so I can pull
Merge branch 'master' of https://github.com/LaunchAcademy/char_brawls
retrieved pokemon pics, implemented them and error image (pokeball) for missing pics
Switched pokepics to aws!
Changed sizing of photos
Fixed character search to go by name, changed seeder to get 698 pokeyman pics, fixed character index display to be even
status update
fix heroku merge conflicts
Fix seeder
Fix typo
Remove redundancies in Gemfile
Merge pull request #36 from LaunchAcademy/PhotoFix

RFR - Changed sizing of photos
resolved merge confliction
really fixed
remove blank linez
Merge pull request #34 from LaunchAcademy/fog_change_seeder_to_save_photos_locally

merge boom! RFR! retrieved pokemon pics, implemented them and error image (pokeball) for ...
fixed merge conflict (it was just the pre-aws image links)