Merge branch 'develop' of https://github.com/Quaese/royals-royce
Merge branch 'master' of https://github.com/Quaese/royals-royce
Merge branch 'master' of https://github.com/prins-pilsje/royals-royce into develop