test for merge conflicts
Merge branch 'master' of https://github.com/doTheEvolution314/Jorge

Conflicts:
	MFCTestApplication/MFCTestApplication/MFCTestApplication.cpp