stuff
Merge branch 'master' of https://github.com/ioniz4tion/travel
weather development
fixed merge conflicts