Commit.
merge
merge
Merge branch 'master' of https://github.com/burlaka/t1.git

Conflicts:
	src/tutorial/threads/JoinSample.java