Merge pull request #18 from adam4813/develop

Merge GLFW
Merge remote-tracking branch 'upstream/develop' into develop