ignore more files
Merge branch 'next' into test

Conflicts:
	.gitignore