Fixed those merge mistakes from my last commit, tell me if it works.
Merge branch 'master' of https://github.com/moosemn456/lightwait

Conflicts:
	Web/javascript/main.js