test commit (some VS project change)
Merge branch 'master' of https://github.com/pepouch/PG3Render

Conflicts:
	PG3Render.vcxproj.user

test commit!
changed pragma -> guard macro