Merge branch 'master' into devel
Create xorg.conf
Merge pull request #10 from hreikin/devel

Devel