Updated Ubuntu (markdown)
Merge branch 'master' of https://github.com/syon/wiki