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

Conflicts:
	db/seeds.rb
Devise user signup
Required tables are not attacing
Merge remote-tracking branch 'upstream/master' into devise
updated devise folder
Merged conflicts