Merge test
Merge testing
Merge branch 'master' of https://github.com/dude0367/KnightNet.git

Conflicts:
	KnightNet/src/com/knight/knightnet/Network.java