Merge remote-tracking branch 'origin/master'

Conflicts:
	ComputerArch/ComputerArch/ComputerArch.cpp