trying to generate a confilict#
Merge branch 'master' of https://github.com/CommanderPaul/DroidStuff

Conflicts:
	aaa.txt
merge conflict!!!