Merge branch 'master' of https://github.com/kdem/levelupdemo

Conflicts:
	file 1
Merge branch 'master' of https://github.com/kdem/levelupdemo
test