added .ds-store to gitignore
Default theme created
merge