merge in problem 5
fix up makefil to delete extraneous files on make