test
asd
asd
Merge branch 'master' into test

Conflicts:
	project1/src/Doctor.java
Finished project number 1 - not graded yet.