na

na
summary
Merge branch 'master' of https://github.com/monstermac77/tagzlyco

Conflicts:
	.DS_Store
	.gitignore
	firstdjango/database.db
	reader/static/.DS_Store