test3....? read file isn't done
test4 taken out bc of errors
Merge origin/master

Conflicts:
	TFS/src/test/TestCases.java