very little..
merge conflicts
Merge branch 'development' of github.com:yoshdog/challenge-me into development
Merge branch 'development' of github.com:yoshdog/challenge-me into development
Jamie | Stopped users email appearing on front page
Merge branch 'development' of github.com:yoshdog/challenge-me into development