working on event_steps
Merge branch 'master' of github.com:gragtah/ColgateCalendar

Conflicts:
	features/event_keywords.feature