2 func
Merge branch 'master' of https://github.com/Kvorum/ProgrammingAssignment2

Conflicts:
	cachematrix.R