add build folder to .gitignore
Merge branch 'master' into new_master