merge caffe
almost done