Blabla
aesyd
Merge branch 'master' of https://github.com/hkernbach/studentPlanner.git

Conflicts:
	studentPlanner/src/studentPlanner/HelloGit.java