Merge branch 'master' of https://github.com/vinfai/gittest

Conflicts:
	src/main/HelloWorld.java
master gittest
Merge branch 'master' of https://github.com/vinfai/gittest