5 commits

Author	SHA1	Message	Date
Wout Schellaert	d323a7065c	Merge remote-tracking branch 'origin/master' ... Conflicts: app/create_database.py	2015-03-28 00:08:27 +01:00
Feliciaan De Palmenaer	b34dc7fccc	Add order items and split views	2015-03-28 00:02:12 +01:00
Wout Schellaert	56c908c63f	Removed slotmachien slack stuff	2015-03-27 14:03:28 +01:00
Wout Schellaert	c851ce11ec	Edited User parameters	2015-03-26 22:23:11 +01:00
Feliciaan De Palmenaer	eba3fc5f07	forgot to add some files	2015-03-26 21:49:14 +01:00