installed new gems
Merge remote-tracking branch 'upstream/master'

added Gems acts-as-taggable-on (+installed), friendly_id, acts_as_votable (+installed), carrierwave, fog
Merge pull request #5 from pedrogrande/master

Added gems to Gemfile and installed acts-as-taggable-on and acts_as_votable