JUnit Parser v1.6
Merge branch 'master' of https://github.com/khaptonstall/BugWars

Conflicts:
	JUnitParser.cpp
JUnit Parser v1.6.3