Counter
Merge branch 'master' of https://github.com/SergeyOlifir/black_note_2

Conflicts:
	public/assets/css/style.css