commit ignore list
Merge branch 'master' of https://github.com/mystics/feedme

Conflicts:
	.gitignore