Pressing 'o' generates a new highrise
Merge remote-tracking branch 'origin/hannah'