first commit
second commit
add project
test git push function
Merge branch 'master' of https://github.com/flowerOurs/flower.git

Conflicts:
	source/server/appService/src/com/huhuo/app/HomeController.java
add
push again
add home controller
Merge branch 'master' of https://github.com/flowerOurs/flower.git
add home controller
huhuo.com
军火炬计划
计划
add commit
add commit
来看看了