Robust condition
Merge branch 'master' of https://github.com/dreammariner/377-assignment

Conflicts:
	Map.java