Up
Merge branch 'master' of https://github.com/jlgshk/JC-ACADEMIC.git

Conflicts:
	src/test/java/test/DocenteDBTest.java