Added some snippets
Merge branch 'master' of https://github.com/m42e/vim-snippets

Conflicts:
	UltiSnips/all.snippets