...
Merge branch 'master' of https://github.com/Unkrass/ichatmyself.git

Conflicts:
	ichatmyselfclient/src/starter.java