Merge pull request #8 from foundersandcoders/dev

merging dev into master
Merge pull request #10 from foundersandcoders/dev

redeploy test
Merge pull request #12 from foundersandcoders/dev

Removing endless npm test command from package.json
Merge pull request #13 from foundersandcoders/master

Master