Fixed conflict
fixed error
Merge branch 'frontend' into glue
Small cleanup in main
Merge branch 'backend' into glue
Bunch of new stuff

Added new course functionality
Working on delete course
Added tentative document structure
Merge branch 'frontend' into glue
fixed file name
Merge branch 'frontend' into glue
Tentatively removed delete course file
Merge branch 'backend' into glue
Merge branch 'frontend' into glue
stuff
Merge branch 'backend' into glue

Conflicts:
	backend/backend.js
removed delete again... this time permanently
Merge branch 'frontend' into glue
Merge branch 'backend' into glue
Merge branch 'backend' into glue
Added a lot of frontend things
Merge branch 'backend' into glue