backing up for dev pull
Merge branch 'dev' of github.com:amulius/group-project-base into teacher-backend
another backup
Merge branch 'dev' of github.com:amulius/group-project-base into teacher-backend
another backup, more progress on teacher backend
merge conflict solved
another update
merge fix
julian backup
backup for testing and depoy
Merge branch 'dev' of github.com:amulius/group-project-base into teacher-backend
backup
Merge branch 'dev' of github.com:amulius/group-project-base into teacher-backend
first working version of the teacher backend
Merge pull request #10 from amulius/student_frontend_jeff

Student frontend jeff
working teacher backend
Merge pull request #11 from amulius/teacher-backend

Teacher backend - looks good to jeff
preparing for pull from dev
fixing merge conflicts
updating by branch after merge with dev