Remarks
Merge branch 'master' of https://github.com/Ditwoo/prj

Conflicts:
	wopengl.cpp