twice added:wq
Merge branch 'hellotwice'

Conflicts:
	src/GitTest.java