buffer size modified
Added table in sidePanel that represents the inventory
Merge conflicts in Network.java
Merge branch 'master' of github.com:Lduperron/CSCI375-Team-Project into sidePanel

Conflicts:
	src/main/java/core/network/Network.java
Added item to inventory
Merge conflict resolution
Merge branch 'sidePanel' of github.com:Lduperron/CSCI375-Team-Project into sidePanel

Conflicts:
	src/main/java/core/client/ClientEngine.java
Merge master into sidePanel
Merge branch 'master' of github.com:Lduperron/CSCI375-Team-Project into sidePanel
Updated the size of the gray box
Merge conflict resolution
Merge branch 'master' of github.com:Lduperron/CSCI375-Team-Project into sidePanel

Conflicts:
	src/main/java/core/client/ClientEngine.java
Merge pull request #10 from Lduperron/sidePanel

Side panel