merege conflict
pulled from master
added game play history to seed file
upated date format
rake db:seed
added user avatar to show when shout is submitted
added border to shout avatar
removed gems paperclip and public activity
installed acts_as_follower gem
Adds following support to users.
Changes location of buttons.
Merged Erik's seed changes.
Merged Erik's Seeds branch.
Merged Erik's Gem Branch.
Removed Migrations for leftovers from Paperclip and Public Activity.
Merged Erik's Acts as Follower Gem Branch.