ooooups
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/main.css
	index.html
	js/main.js
Закидай их фруктами :)