initial commit for wp site
update gitignore
resolve merge conflicts