cleaned up stuff
Merge branch 'master' of https://github.com/ylee82/glowing-wight