merge error
Merge branch 'master' of https://github.com/Speare/Speare-Wordpress
modified