Add watching task to gulp
Merge branch 'master' of github.com:yandex-shri-minsk-2014/team-1

Conflicts:
	gulpfile.js
	server.js