Added admin configurations, added categories that work, modified save function for category.
Merge remote-tracking branch 'origin/master'

Conflicts:
	blog/admin.py
Added admin configurations, added categories that work, modified save function for category.