...
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/networking/Client.java
Merge branch 'master' of https://github.com/craigthelinguist/KnightCapital