The new World model

<Add Later>
Merge branch 'master' of https://github.com/krishnap25/PEL

Conflicts:
	world.pyc
ignore world.pyc

For some reason world.pyc is not merging.