Merging file
Merge branch 'master' of https://github.com/laa018/cs680_team4.git

Conflicts:
	seminer/src/bicho/BichoReader.java