Trying to get testing to work
Merge branch 'master' of https://github.com/Chad-Barlow/CS340

Conflicts:
	Catan/build.xml
Merge branch 'master' of https://github.com/Chad-Barlow/CS340