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
Merge pull request #20 from amulius/student_frontend_jeff

Student frontend jeff
v1 ready for live
Merge pull request #21 from amulius/teacher-backend

v1 ready for live
fixing ansible
Merge pull request #23 from amulius/teacher-backend

fixing ansible
another fix
Merge branch 'teacher-backend' of github.com:amulius/group-project-base into dev
fixed login modal, still needs styling
Merge pull request #25 from amulius/login-julian

Login julian
pretty up the register page
Merge branch 'dev' of https://github.com/amulius/group-project-base into student_frontend_jeff