added total travel time
Merge branch 'master' of https://github.com/gears88/YRS2013

Conflicts:
	js/main.coffee
	js/main.js
Merge branch 'master' of https://github.com/gears88/YRS2013

Conflicts:
	js/main.coffee
	js/main.js
Merge branch 'master' of https://github.com/gears88/YRS2013