Changed slider max value, and fixed bug
Fixed more merge conflicts
Merge branch 'master' of https://github.com/sjlbos/SENG271-GroupProject