Add SSH keys if present
Merge remote-tracking branch 'origin/master'

Conflicts:
	home/mloskot/.bash_profile