Solved some bugs
Merge branch 'master' of git@github.com:nomanocra/Journey