change from local
Merge branch 'master' of https://github.com/beniq/gittest.git

Conflicts:
	src/test/Test.java