From f483f71a82c703f3d2af6a424b0562763a2233a7 Mon Sep 17 00:00:00 2001
From: "Open-Steps.org" <contact@open-steps.org>
Date: Thu, 16 Apr 2015 13:30:56 +0200
Subject: [PATCH] Updated contents

---
 _site/README.md | 23 ++++++++++++++---------
 _site/feed.xml  |  4 ++--
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/_site/README.md b/_site/README.md
index a8774f97..e9243426 100644
--- a/_site/README.md
+++ b/_site/README.md
@@ -20,20 +20,25 @@ bower install
 * Serve files
 ```
 jekyll serve
+# Serve starts a small webserver with your site on http://localhost:4000 for testing
+```
+* Build files
+```
+jekyll build
+# Build generates the HTML/JS/CSS into _site/
+```
+* Commit/Push changes to master or other branch. **NOTE** Optimally, all changes would be done in a separated branch and then merged per Pull-Request into master.
+```
+git add --all .
+git commit -m "Changed this and that"
+git push
 ```
 
 ### Deployment
 
-* Build files
-```
-jekyll build
-```
-* SSH into scopesessions.org and pull the changes from master
+* SSH into scopesessions.org and pull the changes from master.
 ```
 cd /var/www/vhosts/scopesessions.org
+git checkout master
 git pull
 ```
-
-**NOTE:** There are two branches:
-* master: production code, always keep functional and error-free
-* dev: development branch, merge to master when production-ready
diff --git a/_site/feed.xml b/_site/feed.xml
index 83e9ed04..a315e3e8 100644
--- a/_site/feed.xml
+++ b/_site/feed.xml
@@ -6,8 +6,8 @@
 </description>
   <link>http://scopesessions.org/</link>
   <atom:link href="http://scopesessions.org /feed.xml " rel="self" type="application/rss+xml" />
-  <pubDate>Thu, 16 Apr 2015 12:46:17 +0200</pubDate>
-  <lastBuildDate>Thu, 16 Apr 2015 12:46:17 +0200</lastBuildDate>
+  <pubDate>Thu, 16 Apr 2015 13:30:24 +0200</pubDate>
+  <lastBuildDate>Thu, 16 Apr 2015 13:30:24 +0200</lastBuildDate>
   <generator>Jekyll v2.5.2</generator>
   
   <item>