Added search

Other stuff we already did together.
Merge branch 'master' of https://github.com/ouncooper/Project-2

Conflicts:
	PaperCollection.java
Merge branch 'master' of https://github.com/ouncooper/Project-2