User input to slider working now
Merge branch 'master' into website_test
Merge branch 'website_test'
Merge branch 'master' of https://github.com/szymoniks/COMP3001