Merged the .gitignore and build.sh to the master