#1 logout added
Merge remote-tracking branch 'origin/master'