working on the emo counter
debugging
Merge branch 'master' of https://github.com/redaphid/fb-hackathon

Conflicts:
	routes/index.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	modules/facebook.js
Merge branch 'master' of https://github.com/redaphid/fb-hackathon

Conflicts:
	routes/index.js