Partial Conversion to classes (semi-kinda-working)
Resolved conflicts

Conflicts:
	Main.py
	map.py