fixed bugs
fixed merges
Merge branch 'master' of https://github.com/timpei/xtreme-keyboarding
"merged"