bug fixes
Merge branch 'master' of https://github.com/amit1618/APP
formatting changes
Merge pull request #11 from cryptoe/master

bug fixes