Change in master
Merge branch 'master' into Testing

Conflicts:
	build/Advanced Physics.v11.suo
	source/Assignments/DiceAssignment.cpp