GPL
Merge branch 'master' of https://github.com/Selovert/Uploadur

Conflicts:
	.gitignore