text
csv!
Conflicts:
	app.js
Merge branch 'master' of https://github.com/redaphid/fb-hackathon
moved emotion processor to it's own module
got mike's shit
Merge branch 'master' of https://github.com/redaphid/fb-hackathon