Edits to challenge 1 & 2

Edited challenge 1 and 2 so that they calculate correctly