Some changes added to testbed to visualize the confusion matrix
Merge branch 'master' of https://github.com/mprat/caffe

Something from the GPU that came upstream. Or the silly pull request