new var swag
Merge remote-tracking branch 'origin/master'

Conflicts:
	warsofbaraxa/Class1.cs
	warsofbaraxa/bin/Debug/warsofbaraxa.dll