1. Commit todo list
2. Commit Sina
cc
Merge branch 'master' of https://github.com/yhjhoo/testJava.git

Conflicts:
	testJava/src/com/PrinceTest.java