finish emotion
Merge branch 'master' of https://github.com/Andos25/falcon