Sync
Merge branch 'master' of https://github.com/specialk1337/Comp371_Graphics

Conflicts:
	snakesAndLadders/snakesAndLadders/Dice.h
	snakesAndLadders/snakesAndLadders/Game.cpp
Merge branch 'master' of https://github.com/specialk1337/Comp371_Graphics
everything is broken