forgeton
	modified:   MFCApplication1.sln
	modified:   Win32Project1/Win32Project1.cpp
	modified:   Win32Project1/Win32Project1.vcxproj
	modified:   Win32Project1/Win32Project1.vcxproj.filters
	modified:   Win32Project1/stdafx.h
Merge branch 'master' of https://github.com/sharperM/mspCode

Conflicts:
	MFCApplication1.sln
	Win32Project1/Win32Project1.cpp
	Win32Project1/Win32Project1.vcxproj
	Win32Project1/Win32Project1.vcxproj.filters
	Win32Project1/stdafx.h