Merge branch 'master' of https://github.com/schluchter/berlin-transport

* 'master' of https://github.com/schluchter/berlin-transport:
  Preparing for adding git-crypt support
Adding encrypted key file
Updates to project after adding key file