init
Merge branch 'master'
I added a new file to the project
I changed Student Contributor
Merge pull request #17 from coolcsn/master

Please merge the changes to the original repo
again
Merge pull request #18 from coolcsn/master

I did more changes in my repo. Autho merge again works
Merge remote-tracking branch 'upstream/master'