not moving
Merge branch 'master' of github.com:michaeltingley/CS175

Conflicts:
	Assignment7/asst.cpp
Speed\!