1
2
Merge branch 'master' of https://github.com/poriesto/Win32Project1

Conflicts:
	Win32Project1/Win32Project1.cpp