Adding default login 'username' 'password'
Merge remote-tracking branch 'origin/master'