ubuntu commit 8, txt 7 on ubu_dev
ubuntu commit 9, bbbb txt 7 on ubu_dev
Merge branch 'ubu_dev'