wtf git? stop being so annoying and randomly telling me i modify files i dont

might have to revert this one
Merge branch 'master' of github.com:GUCSTeamH/PSD3-GE2