Added search.
Merge branch 'master' of https://github.com/brendan-kelly/304project3

Conflicts:
	src/main/branch.java