Added up button functionality

simple line change
Added Server and Client classes

Basic text communication so far
Changed character sheet class to user information grabbing
Merge branch 'origin/manu-david-testing'

Conflicts:
	.gitignore
	DnDTool/nbproject/build-impl.xml
	DnDTool/nbproject/genfiles.properties
	DnDTool/nbproject/private/private.properties
	DnDTool/nbproject/private/private.xml
	DnDTool/nbproject/project.properties
	DnDTool/src/dndtool/CharacterSheet.java
	DnDTool/src/dndtool/PanelCharacterSheet.form
	DnDTool/src/dndtool/PanelCharacterSheet.java
	DnDTool/src/dndtool/PanelInventory.form
	DnDTool/src/dndtool/PanelInventory.java
	DnDTool/src/dndtool/PanelMain.form
	DnDTool/src/dndtool/PanelMain.java
	DnDTool/src/dndtool/TextBox.java

Merged with wrong branch, sorry ray!