Make the world right again
Merge branch 'master' of https://github.com/hamacting/atpExperiment

Conflicts:
	MathsExerciser/MathsFuncs/Functions.cs