testing conflicts
test
Merge branch 'master' of github.com:doTheEvolution314/Jorge

Conflicts:
	MFCTestApplication/MFCTestApplication/MFCTestApplication.cpp