deleted all from dev
deleted all from master
added wp
merged
added wp-config.php in gitignore