Refactoring
Merge branch 'master' of https://github.com/alexgifei/tripping-adventure