Changed Whitney's address to Portland
Fixed merge. Portland remains as Whitney's address.