All my files
Merge branch 'master' of https://github.com/dodo0822/mscreenbrightness-client

Conflicts:
	.gitignore

Fix .gitignore conflict