hashmap fixed, some tests
Merge branch 'master' of https://github.com/qttran/map

Conflicts:
	src/cs32/maps/MapsEngineTest.java