ignoring ds_store
adding fix you
merging
assets