configured settings
Merge branch 'master' of https://github.com/Kritin/UoG_DIM3_LabRats