add nested lines
change name
Merge branch 'master' of https://github.com/esvit/bazalt

Conflicts:
	Components/Pages/admin.js