MapScreen and Map created
idk what's happening
MapScreen and Map and M4 being weird
Merge branch 'master' of https://github.com/cs2340-team-20/mule

Conflicts:
	src/cs2340/team20/mule/Property.java