Timer updates
Merge branch 'current_info' of https://github.com/SHTheSuper/WavHead into current_info

Conflicts:
	lib/public/main.js