update conv2
Merge branch 'master' of github.com:HoldenCaulfieldRye/caffe-1