#1 Web page now only has one file upload and displays two trajectories
Merge branch 'master' into gh-pages