Push changes
Merge branch 'master' of https://github.com/matthewlopatka/junit-lab

Conflicts:
	test/edu/worcester/cs/kwurst/cs401/StudentTest.java