uz by to melo neco kreslit
Merge branch 'master' of https://github.com/travisdoor/glViewPG

Conflicts:
	main.cpp