Final
Merge branch 'master' of https://github.com/mgamboam/ProgrammingAssignment2

Conflicts:
	R/cachematrix.R
	man/cacheSolve.Rd
	man/makeCacheMatrix.Rd