jian
Jian chen
Merge branch 'master' of https://github.com/gallonp/Giambi.git

Conflicts:
	src/mainClass.java
Jian fifth
Jian Chen
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/mainClass.class
	src/mainClass.java