Text tool
Merge branch 'master' of git@github.com:EdanLTHgit/MultiDraw.git

Conflicts:
	MultiDraw/src/network/ServerConnection.java