Merge branch 'master' of github.com:collectionspace/services

Conflicts:
	README.txt

diff --cc README.txt
index 1edb92244187d80fd9ab6258aee959a3648e1a69,d5518f541e563608d96a2ae2887361403d8f1c06..9e3d9bb10b0edece7b7dde3c373dd8daddc8f244
--- 1/README.txt
--- 2/README.txt
+++ b/README.txt
@@@ -20,4 -20,12 +20,14 @@@ All good boys deserve fudge
  
  All SSH keys deserve better.
  
 +All SSH keys deserve fudge.
++=======
+ Make 1 - Edited on github
+ Make 2
+ Make 3
+ Make 4
+ Make 5
+ Make 6 - Edited on github
+ 
+ Make 7
+ Make 8