Merge branch 'expt-v1' of hyrule.cs.rpi.edu:hotspotter into expt-v1
Merge branch 'expt-v1' of github.com:Erotemic/hotspotter into expt-v1
Merge branch 'expt-v1' of github.com:Erotemic/hotspotter into expt-v1
Merge branch 'expt-v1' of github.com:Erotemic/hotspotter into expt-v1
widsafsdjfdas