Problem #13 working
Added testing code for #13
Changed return value from string to int for consistency in the testing script.
13 didn't merge cleanly. Fixed.
Merge branch 'testing' into working