fix
Merge branch 'master' of https://github.com/bonnenbe/cse471proj3

Conflicts:
	StepDX/StepDX.suo