proper sentence structure and grammer
Merge remote-tracking branch 'origin/conflict-example' into conflict-example

Conflicts:
	first.txt
Revert "Merge remote-tracking branch 'origin/conflict-example' into conflict-example"

This reverts commit 6831fa6e379f97b5e92ab01eb4859ecea1ec070e, reversing
changes made to 31ef7bf1d4f574fea37e2b70592345518bda1838.
name of author is student
add additional winter sport
Revert "name of author is student"

This reverts commit 98522a778580b0a75d94908e8670d9453825f3b7.