Light test, light blending not yet complete
Lighttest tweak
Merge branch 'master' of https://github.com/grotus/fishsticks

Conflicts:
	.gitignore