changes
Merge branch 'master' of https://github.com/Zuzle/travel-startality
changes