Initial set up
Merge branch 'master' of https://github.com/MarcCloud/nwDesk

merging with remote branch