wip 4
Merge branch 'master' of https://github.com/adalbero/TestRepo

Conflicts:
	GitProject/src/com/adalbero/test/Hello.java