initial
Merge branch 'master' into front-end
doc.html users
Merge branch 'front-end' of https://github.com/yandex-shri-minsk-2014/team-3 into front-end
index popup
Merge branch 'front-end' of https://github.com/yandex-shri-minsk-2014/team-3 into front-end

Conflicts:
	public/doc.html
	public/index.html
Merge branch 'master' of https://github.com/yandex-shri-minsk-2014/team-3