Added more text
Merge branch 'master' of https://github.com/peterantkowiak/githubcourse

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