Changed txt
Merge branch 'master' of https://github.com/frkdesign/annjan

Conflicts:
	AMimg/AMimg.txt
Merge branch 'master' of https://github.com/frkdesign/annjan