Brian's update
Merge branch 'master' of https://github.com/briancartercst/kenpository

Conflicts:
	Ken/test.txt