Merge
Merge branch 'master' of https://github.com/Quinten-Ryckbosch/WorkTimer
added settings
merged
Organized imports (I hate warnings)