gem
Merge branch 'master' of https://github.com/wilg/headline-sources

Conflicts:
	.gitignore