something
working add category
Merge branch 'master' of github.com:espehel/UbiLearn into parse
fixed logout
wip
pasient and quiz
jej
working quiz
fixed merge
fixed another merge conflict...
mo
merging
changed from using text id to integer id in practiseDAO
skip now returns test user
fixed errors
Merge branch 'master' of github.com:espehel/UbiLearn
merge
fixed bug regarding updating
moo
merging