tests added + emptytxtfile
Merge branch 'master' of git@github.com:pmanko2/ecse429.git

Conflicts:
	tests/a2/TestA2.java