Fixed merge conflicts of CSC517 Final Project E70