Edited assignment
Merge branch 'master' of https://github.com/samiramly/ProgrammingAssignment2

Conflicts:
	cachematrix.R