Massive Update

Massive change in the code and a new layout.
Merge branch 'master' of https://github.com/teamhusky/Server-client

Conflicts:
	src/server/ServerFile.java