Doc changes

Doc/Upgrade.md

@@ -64,7 +64,7 @@ All you need to do is merge your existing deployment with the release folder whi
 
 ###MySQL(Recomended)
 - Make sure you make a copy of you database and the OpenNote directory
-- Run `Service/model/sql/updateScript/` scripts to roll the database up to current specs.
+- Run `Service/model/sql/updateScripts/` scripts to roll the database up to current specs.
 - You will copy need to copy the upload directory contents into the new upload direcory in `Service/upload`.
 - You will also need to put int you database information in the new config `Service/Config.php`
 

README.md

@@ -1,8 +1,13 @@
 OpenNote [![Build Status](https://travis-ci.org/FoxUSA/OpenNote.png?branch=master)](https://travis-ci.org/FoxUSA/OpenNote)
 =============
 ![][responsive]
+<<<<<<< HEAD
 In a post 9/11 world of mass digital surveillance, there is only one way to keep your digital information safe.
 In the United States, you do not have have 5th amendment rights if you entrust you information to a third party.
+=======
+In a post 9/11 world of mass digital survailence, there is only one way to keep your digital information safe.
+In the United States, you do not have have 4th amendment rights if you entrust you information to a third party.
+>>>>>>> 7c828d12365db60e80fc7cbaa5ed54ed186fa9ca
 
 The fix is to take personal responsibility and host applications yourself.