Ignore build detritus
ignore bins and libs and build detritus
Merge remote branch 'upstream/master'