doing some stuff in doing.txt
Merge branch 'master' into christian