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
Adds the lascake.  The lascake disintergrates whatever it touches.  (todo:  make it effect health, etc.  Or not, for Monday.)
You'll fire at anything that is more than a square away from you, otherwise you'll interact with it.
More infrastructure.

Signed-off-by: Lochlin Duperron <LochlinDuperron@gmail.com>
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
Added laser -- image may need to be cleaned up later
Merge pull request #11 from Lduperron/sidePanel

Added laser -- image may need to be cleaned up later
Modifies door so it behaves slightly more intelligently
Modifies the server engine slightly to behave more intelligently.

Signed-off-by: Lochlin Duperron <LochlinDuperron@gmail.com>
Bullets now record their owner's UID - you can no longer shoot yourself with your own round.

Signed-off-by: Lochlin Duperron <LochlinDuperron@gmail.com>
Merged with new master changes