third commit
Merge branch 'master' of https://github.com/huqbgxixb/tutorial

Conflicts:
	sample.java