adding ability for character with a ship, enough fuel and enough turns to travel to a new location
Refactor ship / character / location relationship
added materials
removing columns from properties
adding property details to location show and adding claim button
adding property details to location show and adding claim button
fixing merge conflict
Merge pull request #8 from OpenSourcePortland/add-resources

Added materials
fix merge conflict between master and add-shops