Justins settings
Merge branch 'master' of https://github.com/monstermac77/tagzlyco

Conflicts:
	.DS_Store