с
Merge branch 'master' of https://github.com/cheer-up/cheer-up.github.io

Conflicts:
	index.html