gitignore
Merge branch 'master' of github.com:ademcan/canSnippet

Conflicts:
	snippets.sqlite
Merge branch 'master' of github.com:ademcan/canSnippet
tyo