ultisnips
Merge branch 'master' of github.com:antekone/vimscripts

Conflicts:
	ultisnips/all.snippets