s
Merge branch 'master' of https://github.com/aqaya/wojay.git

Conflicts:
	GitTest/src/HelloWorld.java