Merge commit 'a21893d4e83a48bc7e4b99383e4170dd6b9558d9' into Developer

Conflicts: README.md
uacaps · Jun 6, 2014 · 94804cd · 94804cd
2 parents 4d19c16 + a21893d
commit 94804cd
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -3,8 +3,7 @@ UniversityPrograms-iPhone
 
 The iPhone app for University Programs
 
-Developer branch build.
 
-No Guarantees of Stability
+This is the master copy, it is a guaranteed stable build but not all features have been implemented.
 
-This branch is updated constantly so always check for updates and don't be suprised is something is fine one day and broke the next.
+If you want a build with more features but is not guaranteed to be stable, the developer branch version is the one you are looking for.