Fixing some things that I forgot to add when fixing the failed merge request earlier in the sprint.
Merge pull request #23 from GarbageElitist/load_xml_object

Fixing some things that I forgot to add when fixing the failed merge req...
Merge pull request #2 from spockNinja/master

Oct 22