Initial Commit
Just some getting used to github...
More getting used to it...
Merge remote-tracking branch 'origin/master'

Conflicts:
	nbproject/project.properties
	src/Client.java
	src/Model.java
	src/SkinList.java
	src/Soundtrack.java