Fitting class with composition rather than inheritance
Clean up indexing
Merge pull request #20 from ShaneDrury/fittingcomposition

Fittingcomposition