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

Conflicts:
	src/class1.java