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

Conflicts:
	.gitignore
adding ignore