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