let's try training conv1 again to see if it was stupid mistake
Merge branch 'master' of github.com:HoldenCaulfieldRye/caffe-1