Haoli test commit
Merge branch 'master' of https://github.com/gallonp/Giambi

Conflicts:
	src/mainClass.java
test
test