and to tr
Merge branch 'master' of https://github.com/amethysty/Test

Conflicts:
	added.txt