Merged properly
Merge branch 'master' of https://github.com/lememta/ways2go