added keyboard control in options menu
Merge branch 'master' into THread
Merge pull request #30 from psmagicman/THread

T hread; THread;tHread