Added other inputs as strings to Map
working on displaying stuff
Merge branch 'master' into isaac

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