modified:   templates/index.html
modified:   templates/line.html
modified:   templates/public/global.html
modified:   templates/public/header.html
modified:   ../mydata.db
modified:   ../static/css/custom.css
new file:   ../static/css/index.css
new file:   ../static/css/line.css
modified:   ../static/css/main.css
modified:   ../tour/views.py
use bootstramp
线路太少, 没有用瀑布流, 一次全拿回来了.
modified:   templates/index.html
modified:   views.py
modified:   ../mydata.db
modified:   ../static/css/index.css
modified:   ../static/css/line.css
modified:   ../static/css/main.css
modified:   ../tour/views.py
new file:   media/photos/2014/05/26/group1.jpg
new file:   media/photos/2014/05/26/group1_1.jpg
new file:   media/photos/2014/05/26/group2.png
new file:   media/photos/2014/05/26/group2_1.png
new file:   media/photos/2014/05/26/group2_2.png
new file:   media/photos/2014/05/26/group2_3.png
new file:   media/photos/2014/05/26/group2_4.png
new file:   media/photos/2014/05/26/headbg.png
new file:   media/photos/2014/05/26/headbg_1.png
new file:   media/photos/2014/05/26/headbg_2.png
new file:   media/photos/2014/05/26/specoffer1.png
new file:   media/photos/2014/05/26/specoffer1_1.png
new file:   media/photos/2014/05/26/trafficBG.jpg
add commit ;
use waterfall
modified:   line/templates/index.html
modified:   mydata.db
modified:   static/css/index.css
Merge branch 'lj'

Conflicts:
	line/templates/public/header.html
change qiangtejia color
deleted:    line.html
modified:   line/templates/index.html
modified:   mydata.db
modified:   static/css/index.css
modified:   tour/views.py
抢特价
TODO:
    tag:天小时分
    tag:价格
modified:   index.html
modified:   public/header.html
modified:   ../../mydata.db
modified:   ../../static/css/index.css
modified:   ../../tour/views.py