nothing
Merge branch 'master' of https://github.com/atorres92/cse471-project3

Conflicts:
	StepDX/StepDX.suo

Fixed issue where sprite walked whilst on platform, and issues while moving on platform
fixed horizontal platform issue