Merge remote-tracking branch 'origin/master' into development
dev commit3
Merge branch 'master' of https://github.com/jakesergeant/testwpsite into development
Merge branch 'refs/heads/development'