1
Merge branch 'master' of https://github.com/bAmerang/csgoconfigbuilder

Conflicts:
	WindowsApplication1/WindowsApplication1.v12.suo