Small updates
Fixed a non-existant merge conflict of spacing due to multiple computer use
Conflicts:
	src/TBSUnit.java