Basic desktop setup
Merge pull request #1 from colavitam/desktop

Basic desktop setup