Map and stuff
Merge branch 'master' of https://github.com/ssabpisa/isocomm
Minor cjage
Merge branch 'master' of https://github.com/ssabpisa/isocomm

Conflicts:
	src/edu/purdue/isocomm/Map.java