standard form for ease of matrix conversion
Merge branch 'master' of https://github.com/ChrisSandison/csc373

Conflicts:
	a2/a2.tex