clampdet non reinit finished
fixed conflict
Merge branch 'master' of github.com:HoldenCaulfieldRye/caffe-1