TTTT
asdfasdfas
agsagdfsgasgas
Merge branch 'master' of https://github.com/picard47at/test

Conflicts:
	MainFolder/ConsoleApplication1/ConsoleApplication1.sdf
	MainFolder/ConsoleApplication1/ConsoleApplication1.v11.suo
	MainFolder/ConsoleApplication1/ConsoleApplication1/Debug/CL.read.1.tlog
	MainFolder/ConsoleApplication1/ConsoleApplication1/Debug/ConsoleApplication1.Build.CppClean.log
	MainFolder/ConsoleApplication1/ConsoleApplication1/Debug/ConsoleApplication1.log
	MainFolder/ConsoleApplication1/ConsoleApplication1/Debug/ConsoleApplication1.obj
	MainFolder/ConsoleApplication1/ConsoleApplication1/Debug/ConsoleApplication1.pch
	MainFolder/ConsoleApplication1/ConsoleApplication1/Debug/stdafx.obj
	MainFolder/ConsoleApplication1/ConsoleApplication1/Debug/vc110.idb
	MainFolder/ConsoleApplication1/ConsoleApplication1/Debug/vc110.pdb
	MainFolder/ConsoleApplication1/Debug/ConsoleApplication1.exe
	MainFolder/ConsoleApplication1/Debug/ConsoleApplication1.ilk
	MainFolder/ConsoleApplication1/Debug/ConsoleApplication1.pdb