2nd commit
Merge branch 'master' of https://github.com/capodanno/Klinika

Conflicts:
	target-eclipse/classes/org/itech/klinika/Doctor.class
	target-eclipse/classes/org/itech/klinika/DoctorController.class
	target-eclipse/classes/org/itech/klinika/DoctorControllerTests.class
	target-eclipse/classes/org/itech/klinika/DoctorTests.class
	target-eclipse/classes/org/itech/klinika/Medicine.class
	target-eclipse/classes/org/itech/klinika/MedicineController.class
	target-eclipse/classes/org/itech/klinika/MedicineControllerTests.class
	target-eclipse/classes/org/itech/klinika/MedicineTests.class
	target-eclipse/classes/org/itech/klinika/Receptionist.class
	target-eclipse/classes/org/itech/klinika/ReceptionistController.class
	target-eclipse/classes/org/itech/klinika/ReceptionistControllerTests.class
	target-eclipse/classes/org/itech/klinika/ReceptionistTests.class
Merge branch 'master' of https://github.com/capodanno/Klinika

Conflicts:
	target/classes/org/itech/klinika/Medicine.class