Add rubbishForTesting() to demo pull request with conflict
Merge pull request #3 from chaosAD/master

Add rubbishForTesting() to demo pull request with conflict