getting rid of _fine in filenames
merging stuff from remote with stuff in local that might not be good (like a ton of files to push that I shouldnt be pushing)
gerge branch 'master' of github.com:HoldenCaulfieldRye/caffe-1