Choices working, fixed menu items, kevin helped.
Merge pull request #59 from CMPUT301F13T05/choices

Choices working, fixed menu items, kevin helped.