to programming-assignment-2
Merge branch 'master' of https://github.com/DJMcClellan1966/programming-assignment-2

Conflicts:
	cachematrix.R