init
Merge branch 'master' of https://github.com/heroku/node-js-sample

Conflicts:
	package.json
cool
hello2
Added index.html
Changed web.js
Change reea dile to sync version