Make movements first, so we can check where we are instead of where we're going to be
Merge branch 'master' of github.com:mrobinson7627/game