3
4
rebase
delete
add
2
3
4
5
6
after tag
Merge branch 'master' of https://github.com/aqaya/wojay.git

Conflicts:
	GitTest/src/HelloWorld.java