first dog code, updated shotgun
Merge branch 'master' of https://github.com/explosivose/FutileCoda

Conflicts:
	FutileCoda.userprefs