Ресурсы
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
Merge branch 'master' of https://github.com/Aries94/aries94.github.com

Conflicts:
	index.html