added castle model and pundit
resolving merge error on add castles