Jared's commit
Merge branch 'master' of github.com:CURG/pylearn_classifier_gdl

Conflicts:
	grasp_classification_pipeline.py
	run_grasp_convnet.py