5
Merge branch 'master' of https://github.com/Dearest/GitTest.git

Conflicts:
	src/com/iotu/Hello.java