Merge pull request #4 from ChetCorey/readme

Readme
Fixed seed file
old seed data
Merge remote-tracking branch 'upstream/master' into readme

Conflicts:
	db/seeds.rb