Never get bored of the settings shiznit
Merge branch 'master' of https://github.com/kreldjarn/final_project
Fixes
Fixes