made the emotional calculator!!
Merge branch 'master' of https://github.com/redaphid/fb-hackathon
Merge branch 'master' of https://github.com/redaphid/fb-hackathon