.gitignore
Merge branch 'master' of https://github.com/sutrix/testgit

Conflicts:
	.gitignore

	new file:   .gitignore