Had to update manually, was having trouble pushing from class computer

Read commit summary