This is not a commit.
Merge branch 'master' of https://github.com/moosemn456/lightwait

Conflicts:
	Web/javascript/main.js
THis is a needless commit