pulling down fresh version from git
Merge branch 'master' of github.com:supasani/Project

Conflicts:
	app/controllers/company_schedules_controller.rb~
	db/seeds.rb~
fixed create event page so that it displays