mario moves

mario moves sideways.
need the printf statement and the empty while loop
fixing merge conflicts

n/a