lighting
more lighting
Merge branch 'master' of https://github.com/ryanreigstad/engine

Conflicts:
	engine/Game.cs
	engine/entities/CameraEntity.cs
	engine/entities/Entity.cs
merge