diff --git a/README.md b/README.md index aa35d8c..9a42863 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,10 @@ 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.