fixed untracked files
Merge branch 'master' of https://github.com/JeppeKnockaert/SYTYCC
Merge branch 'master' of https://github.com/JeppeKnockaert/SYTYCC
Settings screen