Latest JUnit Edition
Merge branch 'master' into upgrade-junit-to-latest

Conflicts:
	pom.xml - Kept my version as there was concerns about bugs in 3.9.2
Merge pull request #2 from githubschool/upgrade-junit-to-latest

Latest JUnit Edition