finished challenge template
merging user login