Fixing django_filtered_feed
Merge branch 'master' of https://github.com/alixedi/alixedi.github.io

Conflicts:
	_posts/2014-08-19-django-filtered-feed.md