began working on p1
Merge branch 'master' of https://github.com/JonathanZWhite/linear-alg-proj

Conflicts:
	.classpath