wip
wip
Merge branch 'jon' of hyrule.cs.rpi.edu:hotspotter into jon