dual typing modes
added documentation
add documentation
Made the button toggle give focus to the text box after being pressed.
Fixed merge conflicts.
Merge branch 'master' into bkoury

Merging the most recent version.