Chages from hammad
Merge branch 'master' of https://github.com/hammadhaleem/Stop
Almost done with api