Closes #33
Merge branch 'master' of https://github.com/ckarande/NodeGoat into ckarande-master

Conflicts:
	package.json
Merge branch 'ckarande-master'