Fix tests for events#today
Add test for Event
Merge pull request #13 from shunsugai/fix-test

Fix tests for events_controller
Merge pull request #14 from shunsugai/add-test

Add test for Event
Merge branch 'master2' into fix-model

Conflicts:
	spec/models/event_spec.rb