Updated gitignore file.
Updated .gitignore
Merge branch 'new_branch_name'

Conflicts:
	.gitignore