doing some stuff in doing.txt
Merge remote-tracking branch 'origin/master' into christian