Added template tags
Added tests for template tags
README updated for template tags
Merge branch 'tags'

Conflicts:
	README.rst
	portfolio/tests.py