gitignore
Merge branch 'master' of https://github.com/LMAdrien/volcanoFTP

Conflicts:
	.gitignore~