Test commit
A third test
Merge branch 'master' of github.com:jrmcclurg/csci3155

Conflicts:
	README.txt