Simultanious?
Merge branch 'master' of https://github.com/mywonderchild/ITU1aarsGruppeJ

Conflicts:
	Detteerentest.txt