Merge pull request BVLC#429 from shelhamer/next

Next: 0.999

.gitignore

@@ -31,6 +31,7 @@ build/*
 distribute/*
 *.testbin
 *.bin
+python/caffe/proto/
 
 # Editor temporaries
 *.swp
@@ -53,3 +54,8 @@ examples/*
 # Generated documentation
 docs/_site
 _site
+
+# Sublime Text settings
+*.sublime-workspace
+*.sublime-project
+

CONTRIBUTORS.md

@@ -0,0 +1,17 @@
+# Contributors
+
+Caffe is developed by a core set of BVLC members and the open-source community.
+
+We thank all of our [contributors](https://github.com/BVLC/caffe/graphs/contributors)!
+
+**For the detailed history of contributions** of a given file, try
+
+    git blame file
+
+to see line-by-line credits and
+
+    git log --follow file
+
+to see the change log even across renames and rewrites.
+
+Please refer to the [acknowledgements](http://caffe.berkeleyvision.org/#acknowledgements) on the Caffe site for further details.