formatted code + updated input

Formatted my code to our specifications and uploaded a test file with
one additional case that tests some things other cases did not.