Updates from feature 2
Manual merge by Brian

Merge branch 'master' of https://github.com/briancartercst/kenpository into Feature-2

Conflicts:
	Brian/test.txt

manual merge of files.
Merge pull request #2 from briancartercst/Feature-2

Updates from feature 2