add gitignore
commit all
Merge commit 'eda0ed0066484219989149f13a580080707b8b73'

Conflicts:
	.gitignore