tl wout finish
Merge branch 'master' of github.com:HoldenCaulfieldRye/caffe-1
update
conv2 training on graphic06
fixed conflict in sovler clamdpet