first commit
Merge branch 'master' of https://github.com/simontse/git-test

I'm confused. Just created a repository on github.com with the same name,
but at the same time I also initialized a repo locally and tried to push.

Now I'm required to merge them.