Added nessicary synchronization.
Merge so that cleaning will effect both branches.
Merge branch 'master' into Bot

Conflicts:
	src/Chater.java