Don’t know what I’ve changed, but it wants me to commit
Merge branch 'master' of https://github.com/alanweide/Strawberry-Tau

Conflicts:
	computer.cpp
	computer.h