Initial scaffolding
Working on Recent Events
Added upcoming events
Merge branch 'refs/heads/recent_events' into development

Conflicts:
	db/schema.rb
	db/seeds.rb
Merge branch 'refs/heads/development' into Rails