Working Version
Merge branch 'master' of github.com:baditya/CapStore