local edit
local changes
Merge branch 'branchSpot' of https://github.com/morganpatz/FillerCreepForAndroid into branchSpot

Conflicts:
	thisfile.txt