Phrasing/clarification edits
Merge branch 'oop' into develop
Fix merge conflict

Conflicts:
	Python/OOP/ObjectOriented1.tex
Changed the lab to make it better
Merge pull request #25 from byuimpactrevisions/eigs

Eigs
created plot to compare solution for problem 1
Edited .tex file
Merge pull request #26 from byuimpactrevisions/complex_sparse

Complex sparse
Merge branch 'develop' of github.com:byuimpactrevisions/numerical_computing into dataStructures
grammar edits. Still needs pictures