Initial
Merge remote-tracking branch 'origin/master'

Conflicts:
	README
	gameobject/world.py