showtime settimeout to 60000
modified:   line/templates/index.html
add over
modified:   line/templates/index.html
modified:   mydata.db
modified:   static/css/index.css
Merge branch 'master' of github.com:hungerr/tour

Conflicts:
	mydata.db