nicos initial
Merge branch 'master' of github.com:user12191938/BerlinTripAssistant
Blabla