Resolving conflict
Merge branch 'master' of https://github.com/tomrunia/empirical-research-methods