Fixed merge conflict with Julian's fire and our firebomb
Merge branch 'master' of https://github.com/themythicaldrago/SoftwareDesign