added Tyler's menu code
Merge branch 'master' of github.com:gerow/groom