Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
I do not want this to be my main readme as it belongs to a very old exercise regarding how to solve merge conflicts. Hence I am changing this because it belongs to one of the first homework assignments.
- Loading branch information