testing
Merge branch 'master' of https://github.com/AdamBSteele/albumTemplateScripts

Conflicts:
	albumCreator.py