asd
Merge branch 'master' of https://github.com/IJskonijn/mindmill

Conflicts:
	DAL/packages.config
-entityFramework