updating dat.GUI and killing .DS_Store
merge with origin/master