update
update
Merge branch 'master' of github.com:sweetdark/openglex

Conflicts:
	GL1.suo
update'