delete debug 1
Merge branch 'debug'
keane commit
keane commit
Merge branch 'KeaneBranch'

Conflicts:
	GitExample/bin/GitExample.class
	GitExample/src/GitExample.java
hao fix 2
Merge branch 'haoFix2'

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