only fetching events for today
Merge branch 'master' of github.com:FrenchBully/chatchat

Conflicts:
	app/controllers/users_controller.rb
	db/schema.rb