cha nges
Merge branch 'master' of https://github.com/afkatja/QlockWise

Conflicts:
	js/BallKeeper.js