Slight optimization to the isPrime function - the function now short-circuits if it encounters a factor greater than 1
Resolving merge conflicts