add gitignore
Merge branch 'jhg'

Conflicts:
	.gitignore
add file on project