Merge pull request #34 from PimV/Develop

Develop
Merge branch 'master' of https://github.com/PimV/Bermuda-TheGame
Apple  + Gold + Water
Gold + Water worden nog nergens aangemaakt!
Flint aangemaakt -> is nu een TOOL -> is dat goed?
PickAxe en Axe image gerenamed -> ook incode

+ Flint filter erbij
inv_gui v1
Inventory Bar Worksz
Merge branch 'Develop' of https://github.com/PimV/Bermuda-TheGame into New_Items_Apple_Gold_Water

Conflicts:
	Bermuda/Bermuda/Bermuda.vcxproj.filters
GoldRock interact-> geeft gold. Cactus interact -> geeft water
onnodig commentaar weg
Merge pull request #73 from PimV/New_Items_Apple_Gold_Water

New items apple gold water
new map
Merge branch 'Develop' of https://github.com/PimV/Bermuda-TheGame into Map
Ice gives water
Merge branch 'Develop' of https://github.com/PimV/Bermuda-TheGame into Inventory_GUI

Conflicts:
	Bermuda/Bermuda/ItemFactory.cpp
json lines added
merge
Merge pull request #74 from PimV/Map

Map
Develop Pulled + pickaxe/axe fix