Changed more i,j,k math
Merge branch 'master' of https://github.com/AldenHiggins/Comp450-Final-Project
planner.cpp again