some shit
Merge branch 'master' of https://github.com/poriesto/QT-OpenGL-Labs

Conflicts:
	QT-OpenGL-Labs.pro.user