[doc](README): readme architecture, testing, contributing, and develo…

…pers sections complete
gtdeng · Oct 17, 2015 · 646177a · 646177a
1 parent b4fc2ea
commit 646177a
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/README.md b/README.md
@@ -36,6 +36,7 @@ Däge also features simple RESTful API calls from the front-end to back-end. How
 
 **Authentication** 
 ![alt text](http://s19.postimg.org/cqx258ptf/manage_users_flow_New_Page.png)
+<<<<<<< HEAD
 
 #HOW DOES THE DÄGEWATCH ALGORITHM SIFT THRU ALL EMAILS?