add user name and group name
Merge remote-tracking branch 'origin/group-gitmasters' into group-camstutz

Conflicts:
	Groupname.md
	Peoples.md
our stuff to do
Merge branch 'group-camstutz' into develop
Merge branch 'develop' of https://github.com/ksetagit/groupproject into develop

Conflicts:
	Peoples.md
Merge branch 'develop' of https://github.com/ksetagit/groupproject into develop

Conflicts:
	Groupname.md
	Peoples.md