Merge branch 'master' of github.com:hellochar/twoguns

Accepted all local changes; also removed node_modules from repo
Merge branch 'master' of github.com:hellochar/twoguns