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

Conflicts:
	Olympus/Object.cpp
Scene file materials, some cloth functionality, tree planter beginnings, shadows, new improved skybox

Must work on cloth to polish it up. Switching scenes is very important too.