Combined task 1 and task 2

Added file that combines task 1 and 2, and outputs results to a csv file