First commit
Fix sftp issues
Merge branch 'master' of https://github.com/Edznux/bashrc-config

Conflicts:
	.bashrc