second initial commit
second attempt
some changes
Merge branch 'master' of https://github.com/IdeaSaplings/TravelFriend