Some changes
Merge remote-tracking branch 'origin/master'
All working
Merge remote-tracking branch 'origin/master'