From 379fdfcbe3cee34699ddc38391b073911081943a Mon Sep 17 00:00:00 2001
From: Merlijn Sebrechts <merlijn.sebrechts@ugent.be>
Date: Tue, 22 Apr 2014 22:19:06 +0200
Subject: [PATCH] Update roles.md

---
 order/roles.md | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/order/roles.md b/order/roles.md
index c56c3df..b91fcec 100644
--- a/order/roles.md
+++ b/order/roles.md
@@ -1 +1,27 @@
-.keepalive
+# Core group
+
+* The core group enables the hacker environment to exist *
+
+ Finance     
+ Core infrastructure  
+ IF CONFLICT && (
+      harrasment
+      || Safety
+      
+# Group Of Members
+
+* The group of members makes and maintains the hacker environment *
+
+ - Create or patch code of conduct (in general assembly)
+ - Solve problems when do-ocracy cannot to fix them
+ - Elect board ( process TBD )
+ - Ban members
+
+# Individual
+
+* The individuals have to be excellent *
+
+ - Follow [Do-ocracy](do-ocracy.md)
+ - Actively try to fix problems
+ - Maintain personnel safety
+ - Apply ${country} law