er
Merge branch 'master' of https://github.com/vstepik/Feelings

Conflicts:
	.DS_Store