improved seamless edgewrap code; added strafe function to ship
Merge branch 'dhakimian' of https://github.com/masonnl/softDev into dhakimian

Conflicts:
	src/Ship.cpp
	src/main.cpp