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

Conflicts:
	web.js
Merge branch 'master' of heroku.com:einsamhauer-bitstarter-mooc
aaa
added social
Merge remote-tracking branch 'origin/staging'
Merge remote-tracking branch 'origin/master'

Conflicts:
	web.js