ADD Commitment Jub jubb
edit *.bak conflict
Merge branch 'tomoridian-master'