试图写了booking_history的js代码
。

。
ADDED: HOTEL SEARCH
MERGED: merged alen to master
FIXED: rolled back all (hope it's all..) buggy changes by Liang
CHANGED: now listening 0.0.0.0 as host instead of localhost
ADDED: hotel search: function fetch_hotel
Merge branch 'master' into czh

Conflicts:
template/index.html
test.py
Merge branch 'master' into czh
index

新增 index
，

，
CHANGED:flight search

display the query result normally. [don't change anything but click
search button to see the result.]
CHANGED: SEARCH PAGE

修改了国际/国内航班搜索时的一些元素。酒店和旅馆的尚待完成。
CHANGED: TABLE flight: add attr(price).
Merge remote-tracking branch 'origin/czh'

Conflicts:
	template/index.html
Merge remote-tracking branch 'origin/liang'
ADDED: hotel info adding via /manage/hotel/async
FIXED: navigation tab of hotel/inn booking in /hotel/search
FIXED: navigation path from "酒店搜索" to "酒店预定"
ADDED: function of hotel adding
Merge branch 'master' into zlk

Conflicts:
	ymmbooking.py
FIXED: /trade/remark -> /trade/comment. YOU SHALL HAVE TOLD ME ABOUT THIS
ADDED: set WAL to sqlite3 when creating new db
ADDED: hotel search