Merge pull request #1 from Tim-Snow/master

Fixed a few bugs, starting on shaders
Merge pull request #2 from Tim-Snow/test

Merge pull request #1 from Tim-Snow/master