Favicon
Merge branch 'master' of https://bitbucket.org/jariz/trapped
Updated readme
Merge branch 'master' of https://github.com/jariz/trapped