known hosts
Alias editing
Anothrt aliases change
known hosts change
Merge branch 'master' of https://github.com/gtaranti/dotfiles

Conflicts:
	ssh/known_hosts