Merge pull request #8 from tvkwoodlands/master

updated menu
Merge pull request #4 from csce431-e/master

thomas pulling