Init the reop
Making changes to the learn file
Added a title
"Meging with the upstream"

Merge branch 'master' of https://github.com/jrsmith3/swcarpentry
Adding more fields under git
Random Changes
Conflict test
Resolved conflict