added turns_spent
add ship fuel and ship_spec
added ship fuel methods
changing ship#fly method to a soft error if not enough fuel
fix schema merge conflict