merged
Merge branch 'master' of github.com:Speare/Speare-Wordpress
revert back