TomScript - creating conflicts
Merge branch 'master' of https://github.com/mqwilber/wildphoto

Conflicts:
	TomScript.py