20131029 add and commit branch begin testing
emacs .gitignore
rebase test summery in README
add bottle.py
emacs HelloWorld.py
commit again in master for README changed to tell
for merge
merge-test change in master
Merge branch 'merge1' in master after rebase test
the same branch for merge2
in master the same branch for merge
Merge branch 'merge1' the 2st time
-for merge conflect:1-
-for merge conflect:2-
mergeconflect solove