Resolved merge conflicts
Changed Copyright to BVLC
Changed matcaffe_demo to return maxlabel
Cleaned matcaffe.cpp to pass lint
Added prints to matcaffe_demo stages
Created reset command and changed END to NULL again
Removed fillers from imagenet_deploy
Added matcaffe_init to easy reuse of caffe initialization
Added default values to matcaffe_batch for testing
Removed empty space, verified lint
Merge pull request #223 from sguada/improved_matcaffe

Improved matcaffe