Fixed typo, fixed simplemathchallenge to conform to project
Fixed merge conflict
SimpleMathChallenge done, but needs smoothing out