adding ignore
Merge remote-tracking branch 'origin/vyara-bhit-master'

Conflicts:
	.gitignore