Temporary changes
Fixing merge conflict
Loading Images

For the settings class
Stupid git
Fixing Conflict

in the settings class
Nothing changed...at all
fixed a thing
Merge branch 'Fixing-Content' of https://github.com/vu1p3n0x/CS206Project into Fixing-Content