Changed commentary style; updated names of callback functions
Merge branch 'dev' of https://github.com/oSoc13/Cityroute into dev