From fdb405e2d62f64dad429bbaa2ee639af30e42b3c Mon Sep 17 00:00:00 2001
From: Hans Fraiponts <fraiponts@gmail.com>
Date: Tue, 13 May 2014 21:10:45 +0200
Subject: [PATCH] fixed conflict

---
 order/roles.md | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/order/roles.md b/order/roles.md
index cd529ef..c9f2fbf 100644
--- a/order/roles.md
+++ b/order/roles.md
@@ -2,28 +2,26 @@
 
 * The core group enables the hacker environment to exist. 
 * The core group should be as "thin layer" as possible. Core group should operate mostly in the background. If the core group does a good job,     they should be invisible.
-* In the current legal structure (VZW) the board members carry the end-responsible. So the core group can only contains the same people that are appointed board-member during the general assembly. This way the people taking the decision must also take the responsible and vice-versa,
+* In the current legal structure (VZW) the board members carry the end-responsibility. So the core group can only contain the same people that are appointed board-member during the general assembly. This way the people taking the decision are also liable and vice-versa,
 no people can take decision without needing to take responsibility for it.
-
- - Finance     
- - Core infrastructure  
- - `if ($conflict && ( $conflict.type == "harrasment" || $conflict.type == "safety" ))`
+* Reposibilities: 
+  * Finance     
+  * Core infrastructure  
+  * `if ($conflict && ( $conflict.type == "harrasment" || $conflict.type == "safety" ))`
       
 # Group Of Members
 
-* The group of members makes and maintains the hacker environment
-
+* The members make and maintain the hacker environment
  - Create or patch code of conduct (in general assembly)
  - Solve problems when do-ocracy cannot fix them
- - Elect board ( process TBD )
- - Ban members
- - More to be added
+ - Elect board, validate membership decisions made by the board.
+ - Keep the space in working order (power, network, upkeep of infrastructure)
+ - Keep the level of consumables acceptable (beer, food, solder)
+ - Organize workshop, events, lectures.
 
 # Individual
 
-* The individuals have to be excellent
-
+* The individuals have to be excellent *
  - Follow [Do-ocracy](do-ocracy.md)
  - Actively try to fix problems
- - Maintain personnel safety
- - Apply ${country} law
+ - Maintain personal safety and that of others