so close
Jeremy Fix me
I think it works a bit
Merge remote-tracking branch 'origin/up_things'

Conflicts:
	src/com/brilliantsquid/crappermapper/CrapperMapperSingleToiletView.java