Initial import.
Merge branch 'master' of https://github.com/nc2y/conflict_authors