Added git
Build tmp add to the list of excluded folders
Merge remote-tracking branch 'origin/master'