conflict creation
sorted out conflict

Merge branch 'beforeIDeeted' of https://github.com/satodd/FillerCreepForAndroid into beforeIDeeted

Conflicts:
	oldfile.txt