Merge branch 'master' of https://github.com/erik-helleren/cs408whiteBox

Conflicts:
	TestifyBugged/build/built-jar.properties

TestifyBugged/build/classes/edu/purdue/cs408/testify/StudentTestify$13.c
lass

TestifyBugged/build/classes/edu/purdue/cs408/testify/StudentTestify.clas
s