Joe | Fixed menu model
Fixed merge conflict
Merge branch 'development' of github.com:yoshdog/challenge-me into development