folders
Merge branch 'master' of github.com:lyoshenka/note

Conflicts:
	views/head.twig.html