short-weather-block
# This is a combination of 3 commits.
# The first commit's message is:
gulp + concat

Conflicts:
	package.json

# This is the 2nd commit message:

generate html files

# This is the 3rd commit message:

Create .editorconfig
прикрутил gulp: stylus + concat + prefixer + watch
почистил от ненужных комментов
background-weather
Merge branch 'master' of github.com:yandex-shri-ekb-2014/team1 into gulp

Conflicts:
	.gitignore
	package.json
background again
Merge remote-tracking branch 'ya-rep/master' into html

Conflicts:
	Gruntfile.js
	package.json
Merge pull request #3 from shri2014ekb/gulp

Gulp
merge
merge
Merge pull request #4 from shri2014ekb/html

index-content
Merge remote-tracking branch 'team1shri/master' into html1

Conflicts:
	.gitignore
	Gruntfile.js
	desktop.bundles/index/index.css
	desktop.bundles/index/index.styl
	package.json