Merge pull request #17 from ashish343/master

merging sjain7 with release
Merge branch 'release' of https://github.com/ashish343/OrderNowServer into release