eerste commit opdracht optiescherm sharedpreferences
merge conflict gitignore resolved