Reordered methods to make it readable
Merge branch 'master' of github.com:IYTECENG316SoftwareEngineering/mapnavigation-agile-app