merge conflict resolution
Merge branch 'master' of https://github.com/tommcfarlin/WordPress-Plugin-Boilerplate