ofa78 and lc34472 Omar Alatorre and Lucas Figueiredo
Merge branch 'master' of https://github.com/cs327e-spring-2014/xml-tests