c

Conflicts:

	cherry.txt
	cherry.txt~
n
Delete .gitignore
Merge branch 'name'
Merge branch 'name' of github.com:Ajka/pts