undef _WIN32
Merge branch 'master' of https://github.com/otya128/cpptest

Conflicts:
	makefile