Signed-off-by: ericwong <win19999@gmail.com>
Merge branch 'master' of ssh://git@github.com/ericsahit/myproject.git

Conflicts:
	jave/javabase/java/src.basic/org/googlecode/java/thinking/basic/io/IOTest.java
for test