Merge branch 'xorg' into 'master'

    

    Modularized and edited xorg info

    

    Probably worth a quick review as this is my first real contribution to the project, just to confirm I understood and followed the expected formats/style/organization.

    

    See merge request !17