3e
local origin
adf
test
ignore unstage area
3333
Merge branch 'vinfai-branch'

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