rename instances of hockeyist, add property owner for puck
Merge branch 'dev'