Done with OR operator
Merge branch 'master' of https://github.com/thv92/GameJam

Conflicts:
	lib.js
Merge branch 'master' of https://github.com/thv92/GameJam

Conflicts:
	lib.js
Merge branch 'master' of https://github.com/thv92/GameJam

Conflicts:
	lib.js