Fixing desktop icons and updating version controlling to master.
Merge pull request #28 from kizeren/master

Fixing desktop icons and updating version controlling to master.