update my master fork

[Legolasindar]

update my master fork

[simonamdev]

I'm going to jump in quickly before you close this PR. This is not how you should update your fork if you intend to branch then submit a pull request back to the main repo. That is what I did, and lo and behold I screwed up my fork, in fact you can see it here: #1141

I have found this guide to be useful to keep my fork up to date with the main repo, however it involves a bit of rebasing, which isn't advised if you're just starting out with git.

https://robots.thoughtbot.com/keeping-a-github-fork-updated

[simonamdev]

Apart from the fact that you've mixed up base & head forks. Base is where you want the changes to go, head is where the changes are coming from :)

[Legolasindar]

I did what I always do, go to my fork and make a Merge from compare. I do not understand what happens.