fixes
Merge branch 'master' into Kmae
fixes
Merge branch 'Kmae'
Merge branch 'master' into kevin

Conflicts:
	CSC380GameProject/src/edu/oswego/tiltandtumble/TiltAndTumble.java