Fixing navigation for the app
Merge branch 'master' of github.com:story-makers/AndroidProject