fix bugs
add merge function
Merge branch 'master' of https://github.com/chishui/Tabida

 necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.