asdasd
Merge branch 'master' of github.com:qwertyuu/1DCellularAutomata

Conflicts:
	1DCA.v11.suo
aaa
caliss
Merge branch 'master' of github.com:qwertyuu/1DCellularAutomata

Conflicts:
	1DCA.v11.suo
	1DCA/1DCA/Game1.cs
	1DCA/1DCA/bin/x86/Debug/1DCA.exe
	1DCA/1DCA/bin/x86/Debug/1DCA.pdb
	1DCA/1DCA/obj/x86/Debug/1DCA.csprojResolveAssemblyReference.cache
	1DCA/1DCA/obj/x86/Debug/1DCA.exe
	1DCA/1DCA/obj/x86/Debug/1DCA.pdb