Adde layout; Removed Gruntfile extra comma; Updated .editconfig
start general weather block
Merge pull request #10 from drzoom3/master

add express server
fixed footer sections classes
Merge branch 'master' of github.com:zyaba/team2; branch 'master' of github.com:yandex-shri-ekb-2014/team2

Conflicts:
	Gruntfile.js
Merge pull request #13 from tenebricosa/issue_4

start general weather block
Merge pull request #11 from zyaba/master

Added layout; Removed gruntfile extra comma; Updated .editconfig
update gruntfile
Merge master and fix conflict