Valid XML formatting, Bug fixes from testing
Merge branch 'master' of https://github.com/travpurc/CSCE-438-HW3