diff --git a/README.md b/README.md
index f752b02..18055a0 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,18 @@
+<<<<<<< HEAD
 MattBurchett.com
 =============
 
-I have forked the JupiterColony.com repository from Rikai. I am putting my own spin on things, and making it my own as a landing page for myself. 
\ No newline at end of file
+I have forked the JupiterColony.com repository from Rikai. I am putting my own spin on things, and making it my own as a landing page for myself. 
+=======
+JupiterColony
+=============
+
+Collaborative design of the JupiterColony landing page, a repository for the site and for design documents/goals.
+
+Notes
+=====
+Both active branches welcome merge requests tha make sense. @rikai and @ChrisLAS have final say on design decisions.
+
+* The master branch will contain style and content documents to help focus the direction, as this is a community effort.
+* The gh-pages branch contains the actual site, and is what pull requests for changes to the live site should be filed against.
+>>>>>>> 2a0d3f80ad2b6d2737581ecc5a983407bb088126