merge conflict
Merge branch 'beforeideleted' of https://github.com/jdemeryx/FillerCreepForAndroid into beforeideleted

Conflicts:
	oldfile.txt --resolved