Now with more rocks
Merge branch 'master' of https://github.com/josephowen/FireHugs
Merge branch 'master' of https://github.com/josephowen/FireHugs