Updating logging
Merge branch 'master' of github.com:benkitzelman/TP-Timer

Conflicts:
	start.js
better reporting