Merge branches 'master', 'master', 'master', 'master' and 'master' of github.com:Stefan101/PSD3-Project
Fixed errors