Update with link to deployed app
Resolve merge conflict