Updating window, committing to pull changes
Merge branch 'proj4' of github.com:madtreat/csce452 into proj4