new branch
Merge branch 'master' into assign4

Conflicts:
	src/ca/bcit/comp2613/a00192788/util/report/Report.java
Completed Assignment #4