Ummm
Merge branch 'master' of https://github.com/FCExB/bearded-ninja
Merge branch 'master' of https://github.com/FCExB/bearded-ninja
Fixed up lighting and player torch