added time input
Merge branch 'master' of https://github.com/lrcusack/GetMeThere
Merge branch 'master' of https://github.com/lrcusack/GetMeThere
manually merged Connie's stuff