oops
oops2
Merge branch 'master' of https://github.com/kimbobo/ProgrammingAssignment2

Conflicts:
	cachematrix.R