more
Merge branch 'master' of github.com:HoldenCaulfieldRye/caffe-1
Merge branch 'master' of github.com:HoldenCaulfieldRye/caffe-1
Merge branch 'master' of github.com:HoldenCaulfieldRye/caffe-1
adding setup_data.py for oversampling
Merge branch 'master' of github.com:HoldenCaulfieldRye/caffe-1