Changes.
Merge branch 'master' of github.com:juliabode/TravelDiary