asdf
Merge branch 'master' of github.com:matthewgrossman/MusicProductivity
Fixes issues w/ updating wasted time
Conflicts:
	eventpage.js