added pink
Merge branch 'develop' of https://github.com/maryoush/test into develop

Conflicts:
	file.txt