Add more stuff
Merge branch 'master' of https://github.com/wkirschbaum/testsomthing

Conflicts:
	textfile.txt