Add build files, update gitignore to include build files
Merge remote-tracking branch 'origin/master'