first commit
:Merge branch 'master' of https://github.com/johns/ubuntu