add a branch
fangxue hou
walkingindaynight
merge two books
added a branch - dev2
first time to try without fast-forward mode