Added rss feed
Merge remote-tracking branch 'origin/master'

Conflicts:
	_config.yml
Revert "Added rss feed"

This reverts commit 11d591850e363fbed75368d8e2639f5f63277ebf.