Pushing the old source, ready for teamwork.
Merge branch 'Test'
Merge branch 'master' of https://github.com/Promises/Wizard-Wars

Conflicts:
	Wizard-Wars/src/Server.java
Merge branch 'Test'

Conflicts:
	Wizard-Wars/src/Server.java