Bad guy added
Merge branch 'master' of https://github.com/josephowen/FireHugs