Git config

Set username and password
Merge branch 'master' of github.com:olesu/my-boxen