acceptance + unit tests
Merge branch 'master' of github.com:cs327e-spring-2014/xml-tests