Added Timer
Merge branch 'master' of https://github.com/jonbuckley33/ProjectRed

Conflicts:
	public/levels/TestLevel.json
	public/scripts/Actor.js
	scripts/CanvasManager.js