Adding intellij settings and ignoring ds_store.
Didn't add intellij files, for some reason.
merge