git changes
Merge branch 'master' of https://github.com/izabelk/NimbusTerrafaux

Conflicts:
	MemoryCards/MemoryCards.v12.suo

	MemoryCards/MemoryCards/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache