Try again
Merge branch 'master' of https://github.com/bcapener/cs342Lab3.git

Conflicts:
	CS342Lab3/src/GeneBankSearch.java