config files
update gitignore
merge upstream changes
add site source files