oops forgot to add some shtuff
Merge branch 'master' of https://github.com/josephowen/FireHugs