z<xz<
Merge branch 'master' of https://github.com/TeamAwesomeITU/FoersteAarsProjekt-V4.git
Merge branch 'master' of https://github.com/TeamAwesomeITU/FoersteAarsProjekt-V4.git
jhj
Merge branch 'master' of https://github.com/TeamAwesomeITU/FoersteAarsProjekt-V4.git
gvh
Merge branch 'master' of https://github.com/TeamAwesomeITU/FoersteAarsProjekt-V4.git
FUCK GIT DIN SO
Merge branch 'master' of https://github.com/TeamAwesomeITU/FoersteAarsProjekt-V4.git

Conflicts:
	.project