yup
Merge branch 'kimmi-obstacles'

Conflicts:
	nbproject/private/private.properties
	src/brentwoodmon/BrentwoodEnvironment.java
	src/brentwoodmon/MapBin.java