A random change of 6907 to stuff1.txt
A random change of 793 to stuff2.txt
A random change of 12142 to stuff3.txt
A random change of 10460 to stuff4.txt
Revert "A change with a password in it"

This reverts commit 0a75b256c5d2557a59352cfc518883356353517b - it was a
bad idea
the dragon arrives
stuff
thing
Merge remote-tracking branch 'fredi/feature' into test-feature

Conflicts:
	stuff3.txt