lukt t?
gitignore
Merge branch 'develop' of https://github.com/bobmulder/windesheim_kbs into develop

Conflicts:
	.gitignore
	DAL/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	House of Notrix.v12.suo
	House of Notrix/House of Notrix.csproj