work pc commit
Merge branch 'master' of github.com:zsutxz/testopengl

Conflicts:
	test.rtf