Setting up testing
Merge branch 'master' of github.com:ryanwmarsh/node-app