added models
deleted scss files
admin settings and log models
models updated (admin settings)
pulling master updatesMerge branch 'master' of https://github.com/emwalpole/HCIN5406_Project into 005_added_models