Merge branch 'master' of https://github.com/dan-boa/xtickme

Conflicts:
public/js/engine.js
Merge branch 'master' of https://github.com/dan-boa/xtickme

Conflicts:
	public/js/test2.js