new ignore files, fun
merge testing

Conflicts:
	.gitignore