Adding to Exercism
Fixed Merge conflicts