1
Merge branch 'master' of github.com:Baipor/JenkinWeb

Conflicts:
	src/test/java/TestGrade.java