Merge pull request #1 from SMillerDev/master

Newest
Merge pull request #2 from Groep4-HvA/master

Merge pull request #1 from SMillerDev/master