1

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

Conflicts:
	Win32Project1.cpp
	Win32Project1.h