sp test 8
Merge branch 'master' of https://github.com/splogic/TestProject.git

Conflicts:
	src/class2.java