backup
Merge branch 'dev' of github.com:amulius/group-project-base into teacher-backend
format touch up
all working
Merge pull request #16 from amulius/style_revisit

format touch up
fixed merge
style changes
Merge pull request #17 from amulius/teacher-backend

Teacher backend
getting ready to merge with dev which now has all of joshs teacher backend updates
fixed merge conflicts
fixing images
Merge pull request #18 from amulius/teacher-backend

fixing images
new merge
Merge branch 'dev' of github.com:amulius/group-project-base into login-julian
fixed account view