update
Merge branch 'master' of https://github.com/PC2R/iSketch

Conflicts:
	Client/Client.java
	Client/ThreadSender.java