sdadssad
Merge branch 'master' of
https://github.com/TeamSluis/SampleJavaWithEclipse.git

Conflicts:
	GitTest/src/Main.java