Add home dir
Merge remote-tracking branch 'origin/master'
Create conf file