change for conflict
Merge branch 'master' of https://github.com/peterantkowiak/githubcourse

Conflicts:
	stuff.txt
Merge branch 'master' of https://github.com/peterantkowiak/githubcourse

Conflicts:
	stuff.txt
why do i have to commit a change i didnt do?
Merge branch 'master' of https://github.com/peterantkowiak/githubcourse

Conflicts:
	stuff.txt