Merge branch 'master' of ece2524.ece.vt.edu:bkicia/forks/project/tm

Conflicts:
	README.yaml
Update
merge
Merge branch 'master' of ece2524.ece.vt.edu:lwegryn/project/tm

Conflicts:
	README.yaml
	__pycache__/movement.cpython-33.pyc