yes
Merge branch 'master' of https://github.com/nickbrook72/sus-video-dog-training-links

Conflicts:
	.idea/vcs.xml