updated syntax
Merge branch 'refs/heads/brianheylin-master'

Conflicts:
	src/consts.rs
	src/glcore.rc