commit!
Merge branch 'master' of https://github.com/fabioluz/mktli510

Conflicts:
	Mkt2.v11.suo
	Mkt2/bin/Mkt2.dll
	Mkt2/bin/Mkt2.pdb
	Mkt2/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Mkt2/obj/Debug/Mkt2.dll
	Mkt2/obj/Debug/Mkt2.pdb

asdfasdfasf