something
working add category
Merge branch 'master' of github.com:espehel/UbiLearn into parse
fixed logout
pasient and quiz
working quiz
fixed merge
fixed another merge conflict...