Sync conflict solved
Merge branch 'master' of https://github.com/Stan-Kerstjens/Pentris.git