gitignore conflict res
re-add site dir
update live docs (dev branch)