Merge pull request #4 from pedrogrande/master

Updates seeds.rb and added database.yml
installed new gems
Merge remote-tracking branch 'upstream/master'

added Gems acts-as-taggable-on (+installed), friendly_id, acts_as_votable (+installed), carrierwave, fog