Messed around with timers
Merge branch 'master' of https://github.com/matthewgrossman/MusicProductivity

Conflicts:
	eventpage.js
Implements timer