add in gitignore file with ftp requsites
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore