So, ready to hand in?
Merge branch 'master' of https://github.com/adam-tibbetts/Karma

Conflicts:
	Ship.t