base
Merge branch 'master' of https://github.com/pymmrd/ireader

Conflicts:
	ireader/templates/base.html