inint
Merge branch 'master' of https://github.com/bizyukov/newsyncwise.git

Conflicts:
	css/style.css
	index.html
	js/app/views/main.ejs