Praktikum 2.2
Merge branch 'master' of https://github.com/Fauli/HCI1

Conflicts:
	HCI_02/src/arztpraxis/AddAppointmentFrame.java