added name
group added
Merge remote-tracking branch 'origin/group-gitmasters' into group-cms

Conflicts:
	Groupname.md
edited groupname :)
add user name and group name
Michael ist ein Klugscheisser
GitHub-Logo in ASCII art
Merge remote-tracking branch 'origin/group-gitmasters' into group-camstutz

Conflicts:
	Groupname.md
	Peoples.md
our stuff to do
Merged GitHub.md
adding 42.md
Merge branch 'group-camstutz' into develop
Merge branch 'develop' of https://github.com/ksetagit/groupproject into develop
merge conflict
Merge branch 'develop' of https://github.com/ksetagit/groupproject 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
Ivan commit
Ivan commit 2
Merge branch 'group-kartoshka' of https://github.com/ksetagit/groupproject into group-kartoshka