new file .gitignore
test
Merge remote-tracking branch 'origin/test' into test

Conflicts:
	README.md