kæmpe commit. merge conflict incoming
Merge branch 'master' of https://github.com/anbae12/Code

Conflicts:
	uC/project/libs/configs/project_settings.h
	uC/project/main.c
	uC/project/semester_project.coproj