delete ignored files
Merge branch 'origin/master'

Conflicts:
	CHANGELOG.md