Updated readme
merge conflict
Onboarding Chris