--- a/server/helpers.py	Sun Jun 02 13:05:50 2013 +0200
+++ b/server/helpers.py	Sun Jun 02 13:23:06 2013 +0200
@@ -1,9 +1,45 @@
 # -*- coding: utf-8 -*-
 
+<<<<<<< local
+from scipy import weave
+import numpy as np
+=======
 import random
+>>>>>>> other
 
+<<<<<<< local
+chars = 'abcdefghijklmnoprstuwqxyzABCDEFGHIJKLMNOPRSTUWXYZ0123456789'
+=======
 CHARS = 'abcdefghijklmnoprstuwqxyzABCDEFGHIJKLMNOPRSTUWXYZ0123456789'
+>>>>>>> other
 
 def gen_filename(chars=12):
+<<<<<<< local
+    ret = []
+    for i in range(chars):
+        ret.append(chars[randint(0, len(chars)-1)])
+    return ''.join(ret)
+=======
     return ''.join(random.sample(CHARS, chars))
+>>>>>>> other
 
+<<<<<<< local
+def get_events(checkins, master):
+    points = reduce(lambda x, y: x.users.extend(y.users) 
+            if hasattr(x, 'users') else x.extend(y.users), checkins)
+
+    unique = np.unique(points)
+    
+    hashed = {}
+
+    for el in unique:
+        hashed[el] = np.array(el, np.empty(10, dtype=int))
+
+    for checkin in checkins:
+        for user in users:
+            unique[checkin.user
+
+
+    
+=======
+>>>>>>> other