Change gitignore

ignore build-dir
Merge remote-tracking branch 'origin/master' into dev