Jespers kommentar
Merge branch 'master' of https://github.com/Plankton555/SOCS_project

Conflicts:
	Main.m