Learning how to use github.

Manually resolving conflict via command line!

Making some more edits to practice git add.