added name to readme
Merge remote-tracking branch 'upstream/master'
fixed seeds.rb and added database.yml file
Merge pull request #4 from pedrogrande/master

Updates seeds.rb and added database.yml