Updated Map constructor
Merge branch 'landon'

Conflicts:
	src/main/java/denfinder/model/Map.java