Jamie | 3 events page errors solved
Merge branch 'development' of github.com:yoshdog/challenge-me into development