Probable sync errors
Merge branch 'master' of https://github.com/choltfo/Grade10programs

Conflicts:
	RPG Game/Calculators.t