test
Merge branch 'Kyle's-Branch'
Merge branch 'Ben's-Branch'
Ignoring .gch files
Merge branch 'Ben's-Branch'

Conflicts:
	SparseMat.h
Resolved conflict
Merge branch 'Ben's-Branch'
Merge branch 'Ben's-Branch'

Conflicts:
	SparseMat.h
Resolved minor conflict
Merge branch 'master' into Ben's-Branch