updating some white space issues
added another test to AppTest.java
made another test within AppTest.java
Merge remote-tracking branch 'origin/feat/jdkoola/test/testmerge2' into feat/jdkoola/group3

Conflicts:
	in-class-2/src/test/java/org/magnum/cs278/testdriven/AppTest.java

tested some merging stuff, but reverted back to unmerged state