Added Challenge button to layout and corresponding string
Fixed merge conflict with strings