HAHAHAHAH!!!!
HAHAHAHAH!
Merge branch 'master' of github.com:muratovv/linux_snippets

Conflicts:
	src/snippet_editor.py
	src/snippets