test7
Merge branch 'master' of https://github.com/jtg172/Senior-Design-I

Conflicts:
	testRepo.txt