got tides + sunrise integration working
finished data sending of sunrise/tides
got merge