preparing for merge with jeffs branch
fixed merge conflicts
ready for jeffs branch
Merge branch 'dev' of github.com:amulius/group-project-base into login-julian
Merge branch 'student_frontend_jeff' of github.com:amulius/group-project-base into login-julian
another fix
Merge branch 'teacher-backend' of github.com:amulius/group-project-base into dev
Merge branch 'master' of github.com:amulius/group-project-base
fixed login modal, still needs styling
Merge pull request #25 from amulius/login-julian

Login julian
Merge branch 'dev' of github.com:amulius/group-project-base