Fixed some movement logic, but did so by duplicating some code...
Merge branch 'master' of https://github.com/brollins90/pro160project.git