commiting changes so I can pull
Merge branch 'master' of https://github.com/LaunchAcademy/char_brawls
Better seed data
John updated us to ruby 2.1.2
merged with master
Formatting & CSS fixes
Fix duplicate navbar, clean up application layout
Remove unnecessary stylesheet links
fixed tests
fixed hound stuff
Merge pull request #35 from LaunchAcademy/jg-cleanup-views

RFR - Jg cleanup views
Resolve merge conflicts
Modify seeder to use find_or_create_by
Merge pull request #30 from LaunchAcademy/Seeding

RFR - Seed File
Changed sizing of photos
status update
fix heroku merge conflicts
Fix seeder
Fix typo
Remove redundancies in Gemfile