fixed changes to station.js
fixed merge conflicts
added player functionality to website
fixed merge conflicts in index
Merge branch 'master' of https://github.com/tmathmeyer/hax