Merge pull request #6 from rayslava/master

Switching to boostless shader preprocessor
Fixed line break
Merge remote-tracking branch 'origin/glfw3'