cleaned coed
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/main.js
Merge branch 'master' of https://github.com/YSUatKHE14/zeroPlayerGame