Trivial changes, just to test branches.
Converted keyPressed to use switch statement, instead of if's.
Trivial change
Merge remote-tracking branch 'origin/master' into Ames1