added score
added ds_store
fix conflict