Hot fix on master
Feature work on testmerge branch
Merged these things
A random change of 23378 to sample1.txt
A random change of 28092 to sample2.txt
A random change of 6268 to sample3.txt
Red thing
A random change of 17351 to sample4.txt and sample 3 and sample 1 all
together.
A random change of 14989 to sample5.txt
A random change of 31052 to sample8.txt
Revert "A random change of 28092 to sample2.txt"

This reverts commit 288ddd1daa55abd817c062d2d7f98bb34564d39c.
Revert 332bf65..2a23e67

This rolls back to commit 332bf65d8f3538a9a0c00aabbf97e57aa6a427c8.