bug fix
Merge branch 'Merge0920'
Merge branch 'Merge0920'
Merge branch 'Merge0920'
Removed left over HEAD from previous conflict
Changed the options menu
Merge pull request #17 from ikounakis/optionsMenu

Changed the options menuマージしました