change description in todo.txt
Merge remote-tracking branch 'origin/master'
session 2
project config files