add new files
add new files
Merge branch 'master' of https://github.com/simonpatrick/tutorial

Conflicts:
	.idea/misc.xml
	.idea/workspace.xml
	nodejs_sample/bin/www
	nodejs_sample/node_modules/.bin/jade
	nodejs_sample/node_modules/body-parser/node_modules/qs/LICENSE
	nodejs_sample/node_modules/body-parser/node_modules/qs/README.md
	nodejs_sample/node_modules/body-parser/node_modules/qs/lib/index.js
	nodejs_sample/node_modules/body-parser/node_modules/qs/lib/parse.js
	nodejs_sample/node_modules/body-parser/node_modules/qs/lib/stringify.js
	nodejs_sample/node_modules/body-parser/node_modules/qs/lib/utils.js
	nodejs_sample/node_modules/body-parser/node_modules/qs/package.json
	nodejs_sample/node_modules/body-parser/node_modules/qs/test/parse.js
	nodejs_sample/node_modules/body-parser/node_modules/qs/test/stringify.js
	nodejs_sample/node_modules/express/node_modules/qs/LICENSE
	nodejs_sample/node_modules/express/node_modules/qs/README.md
	nodejs_sample/node_modules/express/node_modules/qs/lib/index.js
	nodejs_sample/node_modules/express/node_modules/qs/lib/parse.js
	nodejs_sample/node_modules/express/node_modules/qs/lib/stringify.js
	nodejs_sample/node_modules/express/node_modules/qs/lib/utils.js
	nodejs_sample/node_modules/express/node_modules/qs/package.json
	nodejs_sample/node_modules/express/node_modules/qs/test/parse.js
	nodejs_sample/node_modules/express/node_modules/qs/test/stringify.js
	nodejs_sample/node_modules/jade/bin/jade.js
	nodejs_sample/node_modules/jade/jade.js
	nodejs_sample/node_modules/jade/node_modules/.bin/mkdirp
	nodejs_sample/node_modules/jade/node_modules/character-parser/.npmignore
	nodejs_sample/node_modules/jade/node_modules/character-parser/LICENSE
	nodejs_sample/node_modules/jade/node_modules/character-parser/README.md
	nodejs_sample/node_modules/jade/node_modules/character-parser/index.js
	nodejs_sample/node_modules/jade/node_modules/constantinople/node_modules/.bin/uglifyjs
	nodejs_sample/node_modules/jade/node_modules/constantinople/node_modules/uglify-js/bin/uglifyjs
	nodejs_sample/node_modules/jade/node_modules/constantinople/node_modules/uglify-js/node_modules/async/lib/async.js
	nodejs_sample/node_modules/jade/node_modules/constantinople/node_modules/uglify-js/node_modules/optimist/test/_/bin.js
	nodejs_sample/node_modules/jade/node_modules/constantinople/node_modules/uglify-js/node_modules/source-map/test/run-tests.js
	nodejs_sample/node_modules/jade/node_modules/constantinople/node_modules/uglify-js/test/run-tests.js
	nodejs_sample/node_modules/jade/node_modules/mkdirp/bin/cmd.js
	nodejs_sample/node_modules/jade/node_modules/monocle/node_modules/readdirp/examples/node_modules/event-stream/node_modules/optimist/test/_/bin.js
	nodejs_sample/node_modules/jade/node_modules/transformers/.npmignore
	nodejs_sample/node_modules/jade/node_modules/transformers/README.md
	nodejs_sample/node_modules/jade/node_modules/transformers/history.md
	nodejs_sample/node_modules/jade/node_modules/transformers/lib/shared.js
	nodejs_sample/node_modules/jade/node_modules/transformers/lib/transformers.js
	nodejs_sample/node_modules/jade/node_modules/transformers/node_modules/.bin/uglifyjs
	nodejs_sample/node_modules/jade/node_modules/transformers/node_modules/promise/.npmignore
	nodejs_sample/node_modules/jade/node_modules/transformers/node_modules/promise/Readme.md
	nodejs_sample/node_modules/jade/node_modules/transformers/node_modules/promise/index.js
	nodejs_sample/node_modules/jade/node_modules/transformers/node_modules/promise/node_modules/is-promise/.npmignore
	nodejs_sample/node_modules/jade/node_modules/transformers/node_modules/promise/node_modules/is-promise/index.js
	nodejs_sample/node_modules/jade/node_modules/transformers/node_modules/promise/node_modules/is-promise/readme.md
	nodejs_sample/node_modules/jade/node_modules/transformers/node_modules/uglify-js/bin/uglifyjs
	nodejs_sample/node_modules/jade/node_modules/transformers/node_modules/uglify-js/node_modules/optimist/test/_/bin.js
	nodejs_sample/node_modules/jade/node_modules/transformers/node_modules/uglify-js/node_modules/source-map/test/run-tests.js
	nodejs_sample/node_modules/jade/node_modules/transformers/node_modules/uglify-js/test/run-tests.js
	nodejs_sample/node_modules/jade/node_modules/with/.npmignore
	nodejs_sample/node_modules/jade/node_modules/with/LICENSE
	nodejs_sample/node_modules/jade/node_modules/with/README.md
	nodejs_sample/node_modules/jade/node_modules/with/index.js
	nodejs_sample/node_modules/jade/node_modules/with/node_modules/.bin/uglifyjs
	nodejs_sample/node_modules/jade/node_modules/with/node_modules/uglify-js/bin/uglifyjs
	nodejs_sample/node_modules/jade/node_modules/with/node_modules/uglify-js/node_modules/async/lib/async.js
	nodejs_sample/node_modules/jade/node_modules/with/node_modules/uglify-js/node_modules/optimist/test/_/bin.js
	nodejs_sample/node_modules/jade/node_modules/with/node_modules/uglify-js/node_modules/source-map/test/run-tests.js
	nodejs_sample/node_modules/jade/node_modules/with/node_modules/uglify-js/node_modules/uglify-to-browserify/.npmignore
	nodejs_sample/node_modules/jade/node_modules/with/node_modules/uglify-js/node_modules/uglify-to-browserify/.travis.yml
	nodejs_sample/node_modules/jade/node_modules/with/node_modules/uglify-js/node_modules/uglify-to-browserify/LICENSE
	nodejs_sample/node_modules/jade/node_modules/with/node_modules/uglify-js/node_modules/uglify-to-browserify/README.md
	nodejs_sample/node_modules/jade/node_modules/with/node_modules/uglify-js/node_modules/uglify-to-browserify/index.js
	nodejs_sample/node_modules/jade/node_modules/with/node_modules/uglify-js/node_modules/uglify-to-browserify/test/index.js
	nodejs_sample/node_modules/jade/node_modules/with/node_modules/uglify-js/test/run-tests.js
	nodejs_sample/node_modules/jade/node_modules/with/vars.js