include correction
.
Merge branch 'master' of https://github.com/orichalque/Fuzzy_Octo_Nemesis

Conflicts:
	Inventory.cpp