backup
Merge branch 'dev' of github.com:amulius/group-project-base into teacher-backend
all working
fixed merge
style changes
Merge pull request #17 from amulius/teacher-backend

Teacher backend