Merge origin/master

Conflicts:
	src/main/java/cs544/letmegiveexam/model/Subject.java