merging js code
Merge branch 'master' of https://github.com/afkatja/QlockWise

Conflicts:
	index.html