adds info to entity
Merge branch 'master' of https://github.com/AEHO/fb-hackathon
adds scratch for bounce
Merge branch 'master' of https://github.com/AEHO/fb-hackathon