oops, shouldn't have removed station.php
merged conflicts
Merge branch 'master' of github.com:multitudeapp/Multitude-Web

* 'master' of github.com:multitudeapp/Multitude-Web:
  Update README.md