commit
commit
Merge branch 'WorkingBranch' into masterFork

Conflicts:
	Satsuma.v12.suo
commit
commit
commit
commit
commit
commit
commit
commit
commit
commit
commit
commit
Merge pull request #11 from WesThompson/master

Final tests