desktop change
Merge branch 'master' of https://github.com/feihtthief/fuzzy-batman

Conflicts:
	test.txt