v 0.3

Adding scrolling map!
Merge remote-tracking branch 'origin/master'

Conflicts:
	Main.py
	MapObject.py
	Object.py