Merge branch 'master' of https://github.com/shri2014ekb/team1 into HEAD
Merge branch 'html' of https://github.com/shri2014ekb/team1 into HEAD
Merge branch 'html' of https://github.com/shri2014ekb/team1 into HEAD
Merge branch 'html' of https://github.com/shri2014ekb/team1 into HEAD
сверстал поиск
Merge remote-tracking branch 'team1shri/master' into HEAD

Conflicts:
	Gruntfile.js
	package.json
Merge remote-tracking branch 'team1shri/master' into html1

Conflicts:
	.gitignore
	Gruntfile.js
	desktop.bundles/index/index.css
	desktop.bundles/index/index.styl
	package.json
Merge pull request #5 from shri2014ekb/html1

Добавил верхнюю часть хедера