:q#   (use "git reset HEAD <file>..." to unstage)
Merge branch 'WP_upgrade' of github.com:endorphiner/beadscraft into WP_upgrade