Merge branch 'master' of https://github.com/JamesLinnegarTW/trainHack

Conflicts:
public/index.html
dd

dd
dd