Design
Merge branch 'master' of https://github.com/Matonster/Zaalvoetbaltoernooi

Conflicts:
	Documentatie/ProjectFifaV2/ProjectFifaV2.v11.suo
	Documentatie/ProjectFifaV2/ProjectFifaV2/DB.sdf
	Documentatie/ProjectFifaV2/ProjectFifaV2/bin/Debug/DB.sdf
	Documentatie/ProjectFifaV2/ProjectFifaV2/bin/Debug/ProjectFifaV2.exe
	Documentatie/ProjectFifaV2/ProjectFifaV2/bin/Debug/ProjectFifaV2.pdb

	Documentatie/ProjectFifaV2/ProjectFifaV2/obj/x86/Debug/ProjectFifaV2.csproj.FileListAbsolute.txt

	Documentatie/ProjectFifaV2/ProjectFifaV2/obj/x86/Debug/ProjectFifaV2.csproj.GenerateResource.Cache

	Documentatie/ProjectFifaV2/ProjectFifaV2/obj/x86/Debug/ProjectFifaV2.csprojResolveAssemblyReference.cache

	Documentatie/ProjectFifaV2/ProjectFifaV2/obj/x86/Debug/ProjectFifaV2.exe

	Documentatie/ProjectFifaV2/ProjectFifaV2/obj/x86/Debug/ProjectFifaV2.pdb
	Fifa_Dev_Edition/Fifa_Dev_Edition.v11.suo

	Fifa_Dev_Edition/Fifa_Dev_Edition/obj/Debug/DesignTimeResolveAssemblyReferences.cache