changes made on bus
Merge branch 'master' of https://github.com/farazoman/terminal_webapp

q