added purple curtain in test.txt in master branch
merged conflict resolved