Merge pull request #16 from psmagicman/menu

Menu
Merge branch 'master' of https://github.com/psmagicman/think-global-hack-local into menu