minor
Merge branch 'master' of https://github.com/alec101/OSInteraction.git

Conflicts:
	osinteraction.cpp
glext/priv stuff
-made private stuff have '_' in front