first commit
fix merge conflicts
Merge branch 'master' of https://github.com/danchapmanme/pearson-ideas