Update .gitignore
Merge branch 'master' of https://github.com/Korashen/FileMan.git

Conflicts:
	.gitignore