Fixed disappearing text with lighting, fixed some coding style, cleaned up main function
Merge branch 'master' of https://github.com/uchuutamashi/6s096-Project