Add Atom feed
Merge branch 'rss'

Conflicts:
	_posts/2013-07-11-getting-warmer.markdown
	_site/news/2013/07/11/getting-warmer.html