Movement & basic collisions w/ platforms
Merge branch 'tonyEdits'