Merge branch 'development' of github.com:yoshdog/challenge-me into development
Merge branch 'development' of github.com:yoshdog/challenge-me into development
Merge branch 'development' of github.com:yoshdog/challenge-me into development
Merge branch 'development' of github.com:yoshdog/challenge-me into development
Merge branch 'development' of github.com:yoshdog/challenge-me into development
Merge branch 'development' of github.com:yoshdog/challenge-me into development
Joe & Jamie | feature tests added to challenges
Joe & Jamie | Challenge Me link displays for none event owners
Joe & Jamie | Fixed merge conflicts
Merge branch 'development' of github.com:yoshdog/challenge-me into development