added table values in migration
Merge remote-tracking branch 'origin/master'

Conflicts:
	db/schema.rb
	db/seeds.rb
created main events page, and detailed pages for each event
fixed merge conflicts