Fixing saveMap function issues, now works well
Solving last problems of saving map
Merging
Merge branch 'basements' of github.com:clejeu03/minecraft into basements

Conflicts:
	bin/minecraft
	src/main.cpp
	src/minecraft/Map.cpp
Merge branch 'basements' of github.com:clejeu03/minecraft into basements

Conflicts:
	bin/minecraft
	src/main.cpp
	src/minecraft/Map.cpp
Merge branch 'basements' of github.com:clejeu03/minecraft into basements
Displaying inventory + sounds files added to repository
Merge branch 'basements' of github.com:clejeu03/minecraft into basements

Conflicts:
	src/minecraft/Map.cpp
First draft of inventory
Merge branch 'basements' of github.com:clejeu03/minecraft into basements

Conflicts:
	include/minecraft/GraphicEngine.hpp
	src/minecraft/GraphicEngine.cpp
Commiting few changes to test inventory
Merge branch 'basements' of github.com:clejeu03/minecraft into basements

Conflicts:
	src/main.cpp
	src/minecraft/GameEngine.cpp
Can now add in inventory
Adding graphic part of the inventory
Merge branch 'basements' of github.com:clejeu03/minecraft into basements

Conflicts:
	data/autoMap.json
	rock.jpg
	src/minecraft/GraphicEngine.cpp
Trying to catch the current position in inventory, work in progress...
Merge branch 'basements' of github.com:clejeu03/minecraft into basements

Conflicts:
	data/autoMap.json
	include/minecraft/GameIO.hpp
	include/minecraft/GraphicEngine.hpp
	include/minecraft/Map.hpp
	src/minecraft/GameIO.cpp
	src/minecraft/GraphicEngine.cpp
	src/minecraft/Map.cpp
Version Beta of the inventory, displaying issues
Merge branch 'basements' of github.com:clejeu03/minecraft into basements

Conflicts:
	bin/minecraft
	data/autoMap.json
	src/main.cpp
	src/minecraft/GameIO.cpp