Merge pull request #46 from alfeko/master

merge master
SchoolCommit
Settings

Foundation for settings done
dmpbranch