theme set up
updated gitignore
updated git ignore on master
acf plugins
merged .gitignore