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

diff --cc README.txt
index 2d7ef5e5e864ec28e3c116b8d448fb43a8224a77,1d4bcfcce3b6f1476db40235292f7f318ca68cdd..fc611380350097fc549dce8f863b2f853888be6f
--- 1/README.txt
--- 2/README.txt
+++ b/README.txt
@@@ -25,9 -25,7 +25,9 @@@ Make 
  Make 3
  Make 4
  Make 5
- Make 6
+ Make 6 - Edited on github
  
  Make 7
 +
  Make 8
- Make 9 in detached head again.
++Make 9 in detached head again.