first commit
Merge branch 'master' of github.com:WhiteWorld/idesktop

Conflicts:
	README.md