both
Merge branch 'master' of https://github.com/FarahIbrahim/ExData_Plotting1