interim commit
Merge branch 'proj5' of github.com:madtreat/csce452 into proj5
fixed Box struct changes, added isCollision
Merge branch 'proj5' of github.com:madtreat/csce452 into proj5