modif
modif permanent
Merge remote-tracking branch 'origin/master'

Conflicts:
	warsofbaraxa.v12.suo
	warsofbaraxa/Class1.cs
	warsofbaraxa/bin/Debug/warsofbaraxa.dll
	warsofbaraxa/bin/Debug/warsofbaraxa.pdb

	warsofbaraxa/obj/Debug/warsofbaraxa.csprojResolveAssemblyReference.cache
	warsofbaraxa/obj/Debug/warsofbaraxa.dll
	warsofbaraxa/obj/Debug/warsofbaraxa.pdb