just got the enter button working
merge conflicts resolved
Merge pull request #33 from pcs-groupProject/kellen

Kellen