testing ssh and github
Merge branch 'master' of https://github.com/nonicken/conf_home

need to pull before to push again