me
running with /
try / and /allStock
Merge branch 'trunk' of https://github.com/tinytitan-xx/catchup into trunk

Conflicts:
	test1/.classpath
	test1/src/main/java/org/test1/common/App.java
	test1/src/main/java/org/test1/dao/impl/StockDaoImpl.java
cp
cp
useless
adding App.java back
adding protection
Create README.md
remove
Merge branch 'trunk' of https://github.com/rexpie/catchup.git into trunk
remove
Merge branch 'master' of https://github.com/rexpie/catchup into trunk
Merge branch 'trunk' of https://github.com/rexpie/catchup into trunk