Adding key control to window and manager, pulling changes
Merge branch 'proj5' of github.com:madtreat/csce452 into proj5