Got some lighting working
Merge branch 'master' of https://github.com/CaseyMcGuire/CS315_Fall2014

merge