Revert last time change; was causing problems
Merge branch 'master' of https://github.com/hapn-at/hapn-at

Conflicts:
	routes/events.js