implemented movement stuff. started implementing border stuff. all untested for her pleasure!
also converted line delimiters.
Merge branch 'master' of https://github.com/JoeWise/Assignment4

Conflicts:
	shape.cpp