add block with unmodified problems
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	backend/api.js
	backend/routes.js
	frontend/app/controllers/index.js
	frontend/index.html
	frontend/style/css/main.css
block for admin
add block for admin
add block for admin
Merge remote-tracking branch 'origin/master'

Conflicts:
	frontend/index.html
	frontend/style/css/main.css