first commit from Wale
changed whatever
Merge remote-tracking branch 'origin/master'