Merge branch 'master' of https://github.com/jcchin/Hyperloop
Merge remote-tracking branch 'refs/remotes/JustinHyperloop/master'