another change. tagging this commit as ready to test.
Merge branch 'dev' of github.com:clayball/gitgroup-stout into dev

Conflicts:
	dev2test.txt
demonstrating 'git tag -a'