test
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/Debug/Log4NetApplicationLog.log
	bin/Debug/Log4NetApplicationRollingLog.log
	bin/Debug/TestProj.dll
	bin/Debug/TestProj.pdb
	bin/Debug/TestResult.xml
	obj/Debug/TestProj.dll
	obj/Debug/TestProj.pdb