initial commit of joints wp theme files
update gitignore and readme files
fix merge conflicts