Map class
Merge branch 'master' of https://github.com/Rwprice/Ludum-Dare-30

Conflicts:
	LD30/core/src/com/EarthquakeUnicorn/LD30/actors/Map.java