Item pickup
Merge branch 'master' of https://github.com/Toucheaun/Cave-Of-Solitude

Conflicts:
	Cave_of_Solitude/Cave_of_Solitude/Render.cpp