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

Conflicts:
	fuel/app/config/development/migrations.php
	public/assets/css/style.css