removed testing.txt?
Merge remote-tracking branch 'origin/mq'