index work
Merge branch 'master' of https://github.com/Grapheme/infinity

Conflicts:
	static/css/main.css
	static/less/app.less