Changed driver code

Figured out bug in driver code
Finished challenge 2