adding fileA
added fix for issue
fixed the important issue
updated fileA again for the fixone issue
Merge branch 'fixone'

Conflicts:
	fileA.txt

Combine fileA and sort the version to 1.1, 1.2 and 1.4.