FINALLY, resolved merge conflict, sanitized user input, added enter key listener. I hate git.
Merge pull request #8 from bushwack/master

FINALLY, resolved merge conflict, SANITIZED user input, added enter key ...