I don't think I want these changes...
Merge branch 'master' of github.com:goirijo/dotfiles

Conflicts:
	UltiSnips/cpp.snippets
Added bin!