cool
Merge branch 'master' of https://github.com/clucasa/Olympus

Conflicts:
	Olympus.suo
	Olympus/ApexParticles.cpp
	Olympus/Media/Textures/Thumbs.db
	Olympus/RenderManager.cpp
Merged toggles, improved point lights, added torches