Started making tutorials consistent
Resolved merge conflicts