main edit new file
Merge branch 'master' of https://github.com/bjsky/FlashMobile

Conflicts:
	addFile.txt