Finished product
Complete commit

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

Conflicts:
	cachematrix.R