Movement changes with TJ and Zane

Movement re-done
Merge branch 'master' of https://github.com/tjsebastian/EE491

Conflicts:
	.DS_Store