LOG OUT
Merge origin/master