wp update
Merge branch 'master' of https://github.com/shuman/project_v
wp-config ignore
Update WP
Merge branch 'master' of https://github.com/shuman/project_v