modified trainModel.py
Merge branch 'master' of github.com:HoldenCaulfieldRye/caffe-1
progress on run classifier script for redbox
trainMode.py conflict, resolve --theirs