stupid class 2
Merge branch 'James' of https://github.com/seg-s/pr3 into James

Conflicts:
	Lab3/src/lab3/Faculty.java