FINAL, WILL BE SUBMITTED TO D2L
Merge branch 'master' of https://github.com/ouncooper/Project-2

Conflicts:
	PaperCollectionSearchTest.java
	PaperCollectionSortTest.java